Revert r146822 at Pete Cooper's request as it broke clang self hosting.