Rebase emi packages