Issue #3537154 #3529788 Take a different approach

Lee Rowlandsrequested to merge
issue/experience_builder-3537154:3537154-try-revert into 1.x

Closes #3537154 and reverts #3529788 and part of #3534601

Screenshot_From_2025-07-23_13-05-07

Merge request reports