Reverting r51218 because of breakage on PPC32.