LPS-29690 Revert "LPS-25342"

This reverts commit 81bf389149f8508566e43dcee6b1a55ee0ce8778.