Revert "Merge by hand 7_3_X into 7_3_ROOT6_X"
Merge pull request #5991 from cms-sw/revert-5988-merge-by-hand-73-into-73-root6

Revert "Merge by hand 7_3_X into 7_3_ROOT6_X"