Revert "L1t updates 7 2 x rebased"

Reverts cms-sw/cmssw#5204