Bring back changes lost in merge