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

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