The underlying bug has been fixed in r226736 so there's no need to workaround this anymore. This reverts commit r220923. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@226842 91177308-0d34-0410-b5e6-96231b3b80d8