Revert r173056; it breaks one of the CodeGen-with-PCH tests.