diff --git a/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java b/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java
index 9948ad0..1e3a8fe 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java
@@ -82,12 +82,12 @@
             }
         }
     }
-
+*/
     public synchronized void removeDependents(BundleRevision provider)
     {
         m_dependentsMap.remove(provider);
     }
-*/
+
     public synchronized Map<BundleCapability, Set<BundleWire>>
         getDependents(BundleRevision provider)
     {
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index 0110086..f9200e5 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4647,6 +4647,8 @@
                 m_securityManager = null;
             }
 
+            m_dependencies.removeDependents(adapt(BundleRevision.class));
+
             if (m_extensionManager != null)
             {
                 m_extensionManager.removeExtensions(Felix.this);