Revert "A couple of fixes requested by David A."
Merge pull request #5563 from cms-sw/revert-5543-davidisundefined

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