rolled back changes from bb#8352 - fixes ppc unit tests