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