Revert r183298 and r183300 as the former broke the virtual function lookup in libcxx __locale

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