Tweak to try fixing an annoying problem in our nightly builds