Revert "LPS-50924 better fix?"

This reverts commit 1c2936d1c49c27315f9f89543105b140b3f1913e.