RFPL-3043: Make the ITAutocompleteTokenizing pass again