Drop my proposal. Vote for Konstantin's.
This effectively removed Remy's vote. I was tempted to leave it but the patch is different.

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