Fix buildbot config, take 2.