Fix the Windows build after r185721