This reverts commit 49b23f451c. This appears to break some PPC build bots. Revert while I investigate.
49b23f451c