patch to fix periodic random build failures