Revert "LPS-45866 SF"

This reverts commit 4cca7226f190f4e755df438063c8003651cb2067.