Manual "rebase" via ZIP file