Re-apply r175688, with the changes suggested by Jakob in PR15320.


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