diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java
index 5d22d31a3..00d00e545 100644
--- a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java
+++ b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java
@@ -49,12 +49,9 @@ public class VelocityAutotagRuntime extends Directive implements AutotagRuntime<
     @Override
     public Request createRequest() {
         ViewContext viewContext = (ViewContext) context.getInternalUserContext();
-        
-        //TODO: velocity-tools requires javax
-        
-        HttpServletRequest request = null; //viewContext.getRequest();
-        HttpServletResponse response = null; //viewContext.getResponse();
-        ServletContext servletContext = null; //viewContext.getServletContext();
+        HttpServletRequest request = viewContext.getRequest();
+        HttpServletResponse response = viewContext.getResponse();
+        ServletContext servletContext = viewContext.getServletContext();
         return VelocityRequest.createVelocityRequest(ServletUtil.getApplicationContext(servletContext), request,
                 response, context, writer);
     }