This reverts commit b876f6e2. Still getting build failures on PPC AIX that aren't obvious what is causing them, so reverting while I try to figure this out.