Revert !1973 "Merge branch 'update-utdet' into 'master'"

This reverts merge request !1973 (merged), to prevent the hangs of some throughput tests that appeared when !1973 (merged) was put in lhcb-head.