MSVC build fix following r211749