Re-apply r61158 in a form that no longer breaks tests.


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