LPS-34442 Revert commit as it's not necessary for incremental search