This reverts an update from Patrick:
https://github.com/mageisler/cmssw/commit/ee30ba3e563359b977f20098ecfd93460ebcfe6a#diff-dd2c8ae042badcc662cb6f216da6c7c6R135