Re-commit r152202 hopefully fixing the MSVC linker error.