Revert "Another try at making MSVC happy again."

Prospective revert to see if r208512 helped the MSVC build.

This reverts commit r208497.

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