Fix a merge mistake.