Rework fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56568

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