TRUNK-4426 Reverting unrelated change to the search