Revert "more coverity scan tweaks"

This reverts commit 6c3606162d801da8586af355882885bf1561adf4.