did away with auto_rebase