Revert "LPS-36418 Simplify"

This reverts commit bbc13c04d3082bac716231da9476c562f9eb47c7.