Fix an MSVC failure from r223802