Fix another broken merge.