Fix previous rebase.