Revert "LPS-46345 SF"

This reverts commit 4f4ce11241a1c48b43e4ea6f134c3240577baebf.