Revert "Merge branch 'Remove_legacy_builder' into 'master'"
This reverts merge request !35566 (merged)
Fixes ATR-21896 - failures observed in CI
Edited by Rafal Bielski
This reverts merge request !35566 (merged)
Fixes ATR-21896 - failures observed in CI