Removed the dependence on servlet-api