Reinjected a missing merge.