Fix overnight build breakage (fix from simonpj)