Revert "Merge branch 'sirius10G' into 'master'"

This reverts merge request !384
5 jobs for revert-9aca93cc in 6 minutes and 38 seconds (queued for 3 seconds)