Revert "LPS-49233 SF"

This reverts commit 3ac38dfd0221b4b6e47f45029f9e6d9309506526.
Revert "LPS-49233 fix broken build"

This reverts commit 03b1d9e4a4334fb8aef1b55c9da001d081a7ea20.
LPS-49233 Proper fix