Moved back to Servlet 2.5 for Google AppEngine