This reverts commit e93e0d41. There's some ordering problems on some on the buildbots which needs investigating.