Merge "Revert "[search] Remove more dead code""