(an obsolete patch that was here has been deleted)