Fix a faulty manual merge.