revert bad merge #10577

Job	Run time
Windows 2022/Visual C++ 2019 (check)	27m 48s
Windows 2025/Visual C++ 2019 (check)	28m 31s
Windows 11-arm/Visual C++ (btest test-basic test-tool)	16m 43s
Windows 2022/Visual C++ 2019 (test-bundled-gems)	33m 6s
Windows result	1s
	1h 46m 9s

Provide feedback