forward-port my code to CMSSW_7_1_X