WIP: Anger the buildbot again #3a