Revert "New experimental search"

This reverts commit cf3ca60109ef7e55debdd44b36ede352fc995d8d.