Revert "LPS-46537 SF"

This reverts commit 49bd1a140764a20356e5320028531b9614c2ddfa.