Revert "enable_search_with_value"

This reverts commit b44f8e92843969856eca7ff3d58530a2f73f9031.