Revert r1529150 as it triggers unit test failures. It needs more thought.

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