This reverts commit bd8fbdee. This broke the powerpc build - more fixes are needed before we can undo this revert.