Revert refactor #98971
What does this MR do and why?
This reverts !98971 (merged) in the 15-5 stable release to backport the fix and to address #382710 (closed). An issue for the proper fix is tracked here. A similar revert has already been added to master
and marked for patch release via Pick into 15.6
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.