More buildbot fiddling.