Revert "LPS-49233"

This reverts commit 1ccba2abf3bad8f2538fc802eb1d6738a7a3707e.
LPS-49233