Revert "fixing tomcat7 jar dependencies", broke building. Oops.

This reverts commit 31ae5eac250d89a368a218e71f543c241afb2343.