Fix for intermittent Windows failures, see #22628#22648

Manishearth wants to merge 1 commit intorust-lang:masterrust-lang/rust:masterfrom

Manishearth:chewing-gum-and-duct-tapeManishearth/rust:chewing-gum-and-duct-tapeCopy head branch name to clipboard