WIP: Restore after rebase