Unbreak buildfarm

I removed an intermediate commit before pushing and forgot to test the
resulting tree :-(