Revert "Consumes are restored in DiLepton code, conflict is resolved"

Reverts cms-sw/cmssw#4499