Rolling this change back because the fix doesn't fit the symptoms (even if it solves them).

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