LPS-35728 Revert last Igor's commit as per test breakage: we will wait till a better performance fix is done