Revert "Merge pull request #17020 from jmcanterafonseca/vivien_search"

This reverts commit 2ac4603e3269c5d410869a76c13a25bdb6a79241, reversing
changes made to 8280f6749b8183e4bc52ce84affca310858e86d2.