Revert "Merge branch 'sponce_dd4hep' into 'master'"

This reverts merge request !2589 (merged)

The problem is that !2589 (merged) has been applied with "squash commit" on which lost the history and prevents clean rebase. To this merge request undoes the merge and it will then be reapplied properly