Fixing MSVC after r206622?