Revert "Changes in the CondFormat (Only) necessary for migration to 6x6 ...

Reverts cms-sw/cmssw#6483