Revert MR !145522
What does this MR do and why?
This reverts merge request !145522 (merged) because it breaks a QA spec on master.
Related issue: #448909 (comment 1809576402)
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Edited by Panos Kanellidis