This reverts commit r309995. It looks like it's responsible for breaking
the stage2 coverage build:

http://green.lab.llvm.org/green/job/clang-stage2-coverage-R_build/1402

The cfe-commits discussion re: r309995 has more context.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@310019 91177308-0d34-0410-b5e6-96231b3b80d8