LPS-38106 Revert changes of LPS-35799