WIP: Anger the buildbot again #2c