Revert "LPS-46416 SF"

This reverts commit c603bac8fa917630ba1d00d9fa4812120fb1f7b6.