[#eng-3373] Remove search workaround now that the issue is fixed in ES