This reverts commit ade5023c. Reverting this commit as it is dependent on a test breaking the PPC BE bots.