Revert "Tomcat 8"

This reverts commit 12b4e8af1a71718556b3ababc505a51b02be5171.