Updated for CMSSW_6_1_2_SLC8_patch4