Revert r222416, r222422, r222426: the former revision had problems and fixing them introduced bugs

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