Revert "LPS-35703"

This reverts commit f40d9e5a77cf73d69f89b54d4a374ce31a20eb30.
Revert "LPS-35703"

This reverts commit 99fe96bc8d118ac4aa7b494637ba00af8a02ca34.