Revert "LPS-38599 SF"

This reverts commit 8fe2dd14448edee13ba0fb2bb754f9da797d48c5.