Merge "Revert "Force client composition if we'd use rotator"" into pi-dev