Revert "LPS-29078 temp commit"

This reverts commit f8735ad8973fd54f9d600381916110ec080ee6b7.