Revert "LPS-49175 SF"

This reverts commit 7dda6e478f2570366356374b0e9fcef80f2ef97a.