Working on a better solution to this. This reverts commit 7d4e9934e7. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190990 91177308-0d34-0410-b5e6-96231b3b80d8
7d4e9934e7