Fixup after merge/rebase.