Revert "SearchNearBy"

This reverts commit af2f1cde62c0de8a87c0a5e9cee857b8c498e1eb.