Add back changes lost in merge.