Revert fe210265

6 jobs for master in 9 minutes and 51 seconds (queued for 9 minutes and 50 seconds)