This reverts commit 0b1d1cdb89. It causes a clang crash. Details will be posted to D153638.
0b1d1cdb89