Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=42565 since it caused https://issues.apache.org/bugzilla/show_bug.cgi?id=45511 A better fix for 42565 will follow
Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=42565 since it caused https://issues.apache.org/bugzilla/show_bug.cgi?id=45511
A better fix for 42565 will follow

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@681735 13f79535-47bb-0310-9956-ffa450edef68

apache/tomcat,apache/tomcat,apache/tomcat,Nickname0806/Test_Q4,Nickname0806/Test_Q4,Nickname0806/Test_Q4,apache/tomcat,apache/tomcat,Nickname0806/Test_Q4