we have always asked users to rebase manually