hopefully fixed gerrit builds