Sync with changes to how autoselect works.