diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java b/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
index 786c896d2f..1e6d1efbd1 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
@@ -163,15 +163,19 @@ public Map<String, Object> getSession() {
         return super.getSession();
     }
 
-    @Override
     public ActionContext withValueStack(ValueStack valueStack) {
+        return withValueStack((org.apache.struts2.util.ValueStack) valueStack);
+    }
+
+    @Override
+    public ActionContext withValueStack(org.apache.struts2.util.ValueStack valueStack) {
         super.withValueStack(valueStack);
         return this;
     }
 
     @Override
     public ValueStack getValueStack() {
-        return super.getValueStack();
+        return ValueStack.adapt(super.getValueStack());
     }
 
     @Override
diff --git a/core/src/main/java/org/apache/struts2/ActionContext.java b/core/src/main/java/org/apache/struts2/ActionContext.java
index bfde35f124..79f7552d52 100644
--- a/core/src/main/java/org/apache/struts2/ActionContext.java
+++ b/core/src/main/java/org/apache/struts2/ActionContext.java
@@ -20,9 +20,9 @@
 
 import com.opensymphony.xwork2.conversion.impl.ConversionData;
 import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.dispatcher.HttpParameters;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.util.ValueStack;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;