Redo stuff lost in merge.