Revert changes incompatible with the 2016-patches stack
- Revert !24 (merged)
- Fix memory leak as pointed out in the comments of !24 (merged)
- See LHCBPS-1685
GitLab jobs artifacts no longer stored forever as of Monday, November 4th 08:30h. Further information under https://cern.ch/otg0152576