Make local development work again

5 jobs for master in 12 minutes and 21 seconds (queued for 1 second)