Revert r1609326 as it contained fixes for multiple separate issues

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