Revert "Merge branch 'MuonMergeGeoCond' into 'master'"

This reverts merge request !172 (merged)

Unfortunately, I merged it too quickly since !822 is not really ready and I have no time estimate for fixing that.