Revert changes for 42747 whilst I work on a better fix.

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