Revert "Revert r189902 as the workaround shouldn't be necessary anymore."

Needs testcase updates.

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