LPS-44098 Revert changes of b839c5080d294e560a532c5987bb65aea2e87429 because it creates LPS-44312