LPS-36614 Revert