Abort now rolls back to last upstream hash