A modified version of this patch was committed to the trunk.