Revert 272328 and 272329 to recommit as a single patch.

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