4025 Revert autocomplete steps