partial revert of 4853d9c8, eliminate dead code

As suggested by CID 71964 (coverity).
Merge branch 'code/hygiene'

* code/hygiene:
  partial revert of 4853d9c8, eliminate dead code
Merge branch 'master' into coverity-scan

* master:
  partial revert of 4853d9c8, eliminate dead code