This may overwrite types that have already been generated and can create unwanted empty files. Fixes #8490
Fixes #7971 Co-authored-by: Derek Bailey <derekbailey@google.com>