Let's try a bit less house cleaning to see if the buildbot slave survives.