Revert r205599, the commit was not intended to have so many changes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205600 91177308-0d34-0410-b5e6-96231b3b80d8
5 files changed