Revert "Prepared for CMSSW_7_0_0_pre8 on slc5_amd64_gcc481"

This reverts commit 4f69a2b0be81ac3388aa4f81cb03b03f7e8e9fbb.