This reverts commit r309942 & commit r309940.

A revert was requested following post commit review.


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