This is in conflict with https://github.com/cms-sw/cmssw/pull/156