LPS-40533

Too much performance regression, we need to try other ways to fix this.