This reverts commit ccc83ac7. Reverting this commit as it is dependent on additional commits breaking the PPC BE bots.