Fix more rebase issue.