Continue workaround for MSVC linkage bug.

See related commit c21a85fa4ebee1a086a625d7eb29f9b1250b8ec2.