Re-add accidently overwritten changes from Ash

2 jobs for master in 4 seconds (queued for 6 seconds)