This reverts commit 4c48ea68. The powerpc buildbots had an internal compiler error after this patch. This requires some inspection.