Fix a merge error from the last rebase.