Revert r1576000
It obviously was meant to be applied for trunk, not for Tomcat 6.

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