Remove hack for early Tomcat version