Temporary revert of changes in 20002 which caused a regression

[eileenmcnaughton]

Overview

This backs out the changes in #20002 to allow us to fix the regression in long standing functionality. The goal is to re-ininstate the functionality but given we have 2 pieces of functionality currently in conflict with one being from 5.38 & the other being long-standing this seems the more stable approach

Before

#20997 scenario broken. new functionality in #20002 works

After

The reverse - for better and worse. However, the long-standing functionality is now locked in with a test

Technical Details

Note that there is fairly long discussion on #20997 & quite a bit of complexity

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[demeritcowboy]

Did some basic r-run - looks ok.