I am attaching a patch.  Please apply to trunk.