--- a/src/org/eclipse/jetty/server/handler/ContextHandler.java	Tue Oct 18 21:22:53 2016 -0600
+++ b/src/org/eclipse/jetty/server/handler/ContextHandler.java	Tue Oct 18 22:43:17 2016 -0600
@@ -184,11 +184,7 @@
 	@Override
 	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		if (LOG.isDebugEnabled())
-			LOG.debug("scope {}|{}|{} @ {}",baseRequest.getContextPath(),baseRequest.getServletPath(),baseRequest.getPathInfo(),this);
-
 		String old_context_path = null;
-		String old_servlet_path = null;
 		String old_path_info = null;
 		String pathInfo = target;
 
@@ -221,7 +217,6 @@
 		try
 		{
 			old_context_path = baseRequest.getContextPath();
-			old_servlet_path = baseRequest.getServletPath();
 			old_path_info = baseRequest.getPathInfo();
 
 			// Update the paths
@@ -232,13 +227,9 @@
 					baseRequest.setContextPath("");
 				else
 					baseRequest.setContextPath(_contextPath);
-				baseRequest.setServletPath(null);
 				baseRequest.setPathInfo(pathInfo);
 			}
 
-			if (LOG.isDebugEnabled())
-				LOG.debug("context={}|{}|{} @ {}",baseRequest.getContextPath(),baseRequest.getServletPath(), baseRequest.getPathInfo(),this);
-
 			try
 			{
 				super.handle(target,baseRequest,request,response);
@@ -257,7 +248,6 @@
 				// reset the context and servlet path.
 				baseRequest._contextHandler = oldContextHandler;
 				baseRequest.setContextPath(old_context_path);
-				baseRequest.setServletPath(old_servlet_path);
 				baseRequest.setPathInfo(old_path_info);
 			}
 		}