Revert "Merge branch 'followGaudi577' into 'run2-patches'"

This reverts merge request !1050 (merged) - should not be applied for Brunel v55r3 that depends on Gaudi v33r2, where gaudi/Gaudi!577 (merged) is not applied