I think this should be made into a patch.  And that patch should probably be sent upstream.