Merged refs/pull/156/head from repository cms-sw
Revert "porting into CMSSW_7X"

This reverts commit a4eaf31dd99b0cff14bb286f64c36fa8bf3d7699.