Revert "LPS-46658 SF"

This reverts commit 3351721b7e226905ec6cc6fa75a109966ce4f11f.