Merge pull request #6179 from ctiller/fuzzing-hell

Fix fuzzing sanity