Revert "Merge pull request #2933 from mark-grimes/fixBugInHcalDigisClientAgain"

This reverts commit cb5a53d08244e2705b8b5cc4d677a4489baec5a0, reversing
changes made to 75ec92505337f03230a89bf1a359bdddb26386b4.