Bring back changes that got lost in merge