Fix bug with RouterServlet not using the original request