LPS-38457

chose a simpler approach.