Fix changes lost during the merge.