Revert modification of item search

I may want to use autogenerated code that relies on it.