diff --git a/framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java b/framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
index bb8e1c8..7630731 100755
--- a/framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
+++ b/framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
@@ -20,6 +20,7 @@
 import java.util.*;
 
 import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.util.SecurityManagerEx;
 import org.apache.felix.moduleloader.*;
 import org.apache.felix.moduleloader.search.ResolveException;
 import org.apache.felix.moduleloader.search.ResolveListener;
@@ -52,7 +53,7 @@
     public static final R4Wire[] m_emptyWires = new R4Wire[0];
 
     // Re-usable security manager for accessing class context.
-    private static SecurityManagerX m_sm = new SecurityManagerX();
+    private static SecurityManagerEx m_sm = new SecurityManagerEx();
 
     public R4SearchPolicy(LogWrapper logger)
     {
@@ -1626,13 +1627,4 @@
             }
         }
     }
-
-    // Utility class to get the class context from the security manager.
-    private static class SecurityManagerX extends SecurityManager
-    {
-        public Class[] getClassContext()
-        {
-            return super.getClassContext();
-        }
-    }
 }
\ No newline at end of file