diff --git a/mozilla/xpcom/build/nsXPComInit.cpp b/mozilla/xpcom/build/nsXPComInit.cpp
index 7cb910f87df..df8b4560415 100644
--- a/mozilla/xpcom/build/nsXPComInit.cpp
+++ b/mozilla/xpcom/build/nsXPComInit.cpp
@@ -441,11 +441,7 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr)
     // Finally, release the component manager last because it unloads the
     // libraries:
     NS_RELEASE2(nsComponentManagerImpl::gComponentManager, cnt);
-    // XXX after shaver fixes jsloader to not hold a reference, we can enable the
-    // XXX the following assertion for everyone.
-#if defined(DEBUG_shaver) || defined(DEBUG_dp)
     NS_ASSERTION(cnt == 0, "Component Manager being held past XPCOM shutdown.");
-#endif /* DEBUG_shaver */
 #ifdef DEBUG
     extern void _FreeAutoLockStatics();
     _FreeAutoLockStatics();