Revert "Possible fix for coverity #29375"