go back to return Servlet instead of ServletContainer