Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56451
Revert r1592052 and apply and alternative fix that should have fewer side effects.

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