Revert "A couple of fixes requested by David A."

Reverts cms-sw/cmssw#5543