Remove duplicate code introduced in merge.