For those interested, check out
http://svn.apache.org/viewvc?rev=590641&view=revpasts tests and works as expected, at least in my limited testing :) Again, the main focus in this was to resolve the "issue" in a 2.2-friendly way. So I'd like to get additional feedback with that in mind before I propose a backport.
