Revert r204562,204566,204586,204587 as they broke ASan on Windows

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