Another attempt to remove random build failures.