This reverts commit 632a389f96. This relands commit 1834a310d0. Differential Revision: https://reviews.llvm.org/D137493
632a389f96
1834a310d0