Reverted changes in openmrsSearch made in the fix for TRUNK-3833