I attached a patch to http://issues.apache.org/bugzilla/show_bug.cgi?id=25121.
It was a little bit more than just replacing the methods because there was some major refactoring http://svn.apache.org/viewcvs.cgi?rev=28858&view=rev on trunk only. Cheers, Alfred.
