This reverts commit 887b8bd733ea36aaa5d9b0a2b45df16c6f6bb6a4 while we work on resolving issues brought up in https://reviews.llvm.org/D132480.
This reverts commit 887b8bd733ea36aaa5d9b0a2b45df16c6f6bb6a4 while we work on resolving issues brought up in https://reviews.llvm.org/D132480.