Revert "Merge branch 'cherry-pick-a7b85b25-22.0' into '22.0'"
This reverts merge request !54232 (merged) as it is causing crashes in several HLT jobs (ATR-25705).
This reverts merge request !54232 (merged) as it is causing crashes in several HLT jobs (ATR-25705).