WIP: Anger the buildbot again