Fix a bad merge on stable.