revert some tomcat 6 incompatible stuff