Revert to Tomcat 8.

That was an accidental checkin.