Small rewrite of the rebase PR