TRQ-2700. Revert a fix for coverity as it caused a problem.

A non-problem causing fix for the coverity issue will come later.