Patching Windows build after utilities refactoring.