Revert r185557 as it was a bit (a lot) premature.

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