LPS-39996 Revert changes of LPS-36622