Restoring bad rebase