The new function looks perfect for this situation. Requires a rebase (which needs to be done anyway).