Issue #21907: Try to make the pre-Vista Windows buildbots happier.

Initial patch by David Bolen.