Revert !3335

This reverts merge request !3335 (merged) since I missed the segv failures in Moore: https://lhcb-nightlies.web.cern.ch//compare?a=nightly/lhcb-master/1553&b=nightly/lhcb-master-mr/3236

Reverting so that the nightlies are not affected and we can re-apply, fix and test again.

/cc @sponce