Merge "Revert "Enhance fuzzer coverage.""