LPS-36614 Revert
LPS-36614 SF