This reverts commit bc2773cb. Broke the clang-ppc64le-linux-multistage build. Reverting while I investigate.