Fix a previous incorrect merge.