Revert "LPS-39340 SF"

This reverts commit c06934a3236c3358c88cdeb3f9b1033e8efff1bb.