Remove stray code from the merge.