Revert "fix a few clazy warnings" which contained an unrelated change
This reverts commit 20ea75329ee629737030809a3a7a58a5d2a8664d.