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