Revert r68073. It's causing a failure in the Apple-style builds.