Revert mistaken rebase