This reverts commit 079b610c. Bots are failing after this change on a stage 2 compile of clang. llvm-svn: 354277