This reverts commit 97ba5cde52. Still breaks tests: https://reviews.llvm.org/D76802#2540647
97ba5cde52