This reverts commit 877a9f9a. It depends on the parent revision 42c2dc40 which needs to be reverted as it broke some buildbots, so reverting both.