Reland r206934 with a hopefully fixed test

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