This reverts commit b4c1e5cb. Reverting this as it contains a test that is currently failing on the PPC BE bots.