Revert "Re-revert r343129."

This reverts commit 4e2557dbc76704beb8c4cf1191cb786e719db5d3.

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