Re #2738. See if the failures on Windows related to the same thing

...as those on the Mac (see commit 6b4fcc91).