This is resend of an earlier patch, which received no comments and dropped off the list.