diff --git a/include/boost/mpl/assert.hpp b/include/boost/mpl/assert.hpp
index baf43e0..7f22094 100644
--- a/include/boost/mpl/assert.hpp
+++ b/include/boost/mpl/assert.hpp
@@ -443,8 +443,9 @@ BOOST_MPL_AUX_ASSERT_CONSTANT( \
 /**/
 #endif
 
+#if 0
 // Work around BOOST_MPL_ASSERT_MSG_IMPL generating multiple definition linker errors on VC++8.
-#if defined(BOOST_MSVC) && BOOST_MSVC < 1500
+// #if defined(BOOST_MSVC) && BOOST_MSVC < 1500
 #   include <boost/static_assert.hpp>
 #   define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
 BOOST_STATIC_ASSERT_MSG( c, #msg ) \
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f345656..1c8f393 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -13,7 +13,7 @@ compile apply_wrap.cpp ;
 compile arithmetic.cpp ;
 compile as_sequence.cpp ;
 compile assert.cpp ;
-link assert_vc8_p1.cpp assert_vc8_p2.cpp ;
+# link assert_vc8_p1.cpp assert_vc8_p2.cpp ;
 compile at.cpp ;
 compile back.cpp ;
 compile bind.cpp ;