Remove leftover from merge.

I think this was re-introduced by the merge.