Remove code duplicated in a botched merge.