Rolling back c80564e7fc8fa6ea411496ba2aa1f5a365289193 -- The purpose of that commit is unclear, it has no tests, and it breaks fielded search within collections