WIP Revert "Merge branch 'cherry-pick-0c884990' into '2016-patches'"
This reverts merge request !2328 (merged) - trying to understand cause of failing DV tests since https://lhcb-nightlies.web.cern.ch/nightly/lhcb-2016-patches/build/1352/
This reverts merge request !2328 (merged) - trying to understand cause of failing DV tests since https://lhcb-nightlies.web.cern.ch/nightly/lhcb-2016-patches/build/1352/