Roll out r164732 since it broke Production Mac builds.