Follow-up to 1644529. Better fix that actually passes the unit tests.

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