Restore half of Matt's fix. #10573

Job	Run time
Windows 2022/Visual C++ 2019 (check)	5m 17s
Windows 2025/Visual C++ 2019 (check)	7m 54s
Windows 11-arm/Visual C++ (btest test-basic test-tool)	6m 6s
Windows 2022/Visual C++ 2019 (test-bundled-gems)	5m 30s
Windows result	1s
	24m 48s

Provide feedback