Reland r216439 215441, majnemer has a real fix for PR20771.

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