we might not need the workaround anymore

7 jobs for master in 14 minutes and 26 seconds
latest