Revert "LPS-49600 Use new constructor when necessary"

This reverts commit d1dc97352fc08657877571d50850622f839c5d4c.
LPS-49600 Simplify solution