Fix after rebase.