Reverting r 341390 because it is causing test failures on GreenDragon. http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental/52810/ llvm-svn: 341560 GitOrigin-RevId: 51fdaba4ad3a2ce5556dfd306764773d298b429e