Revert merge request !69655 (ATLSWUPGR-242)
Merge request !69655 (merged) causes unintended output changes in some ART tests: ATLSWUPGR-242
Therefore reverting for now to allow me to do some further testing/tweaking of the changes before reintroducing them.