This reverts commit 7f84f62e. Seems to be causing a bunch of compiler-rt test failures on ppc64-linux bots.