re-insert code which was lost during a merge