reverted r8453, 8445, 8440 and 8438 which should have been reverted along with r8563. These were never published so should be fine
