Revert r1531680 to prevent CI failures and to prevent the Examples webapp from failing to start when running Tomcat 7 with Java 6.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1531713 13f79535-47bb-0310-9956-ffa450edef68