Revert "- fix coverity issues 966593-966596" it is in a separate branch

This reverts commit 5d1004f15d13061aae5819a07dab48674b2390d2.