Buildbot interrupts master-side source steps. Fixes #2356