Remove a spurious line from (we think) a mis-merge.