Attempt to increase the overall happiness of the MSCV-based buildbots.