Removing redundant code apparently left from an incorrect conflict resolution.