This reverts commit db0b8a47, reversing changes made to 5dd84126.
There was some interference between Allen!991 (merged) and Allen!956 (merged) which caused some tests to fail: https://lhcb-nightlies.web.cern.ch/nightly/lhcb-master-mr/5792/
Rosen Matev authored