SI-7486 Regressions in implicit search.

Revert e86832d7e8 and dd33e280e2.
Merge pull request #2590 from paulp/issue/7486

SI-7486 Regressions in implicit search.