Revert commit 186833 (no longer needed after the fix in 186859).



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