diff --git a/core/src/main/resources/struts-excluded-classes.xml b/core/src/main/resources/struts-excluded-classes.xml
index 294e2399b..6e4957273 100644
--- a/core/src/main/resources/struts-excluded-classes.xml
+++ b/core/src/main/resources/struts-excluded-classes.xml
@@ -37,9 +37,7 @@
                 java.lang.ProcessBuilder,
                 java.lang.Thread,
                 sun.misc.Unsafe,
-                com.opensymphony.xwork2.ActionContext,
-                com.opensymphony.xwork2.ognl.SecurityMemberAccess,
-                com.opensymphony.xwork2.ognl.OgnlValueStack"/>
+                com.opensymphony.xwork2.ActionContext"/>
 
     <constant name="struts.devMode.excludedClasses"
               value="
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 39547d3f4..0cafd799b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -879,10 +879,10 @@ public class OgnlUtilTest extends XWorkTestCase {
         assertEquals(123, foo.getALong());
     }
 
-    public void testBeanMapExpressions() throws OgnlException {
+    public void testBeanMapExpressions() throws OgnlException, NoSuchMethodException {
         Foo foo = new Foo();
-        ognlUtil.setExcludedClasses(
-                "com.opensymphony.xwork2.ognl.SecurityMemberAccess"
+        ognlUtil.setExcludedPackageNames(
+                "com.opensymphony.xwork2.ognl."
         );
 
         Map<String, Object> context = ognlUtil.createDefaultContext(foo);
@@ -903,7 +903,7 @@ public class OgnlUtilTest extends XWorkTestCase {
         assertEquals(foo.getTitle(), expression);
 
         SecurityMemberAccess sma = (SecurityMemberAccess) ((OgnlContext) context).getMemberAccess();
-        assertTrue(sma.isClassExcluded(SecurityMemberAccess.class));
+        assertFalse(sma.isAccessible(context, sma, sma.getClass().getDeclaredMethod("setExcludedClasses", Set.class), "excludedClasses"));
     }
 
     public void testNullProperties() {