Roll out r27896 as it caused lots of build breakages.