Fix changes lost in merge.