Revert classversion.
Merge pull request #4335 from ktf/fix-classversion

Revert classversion.
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X