content_generate_fields() calls hook_content_generate too many times (filefield creates many files)

In the content.devel.inc file you can find the content_generate_fields function. There's a TODO in the description so somebody might already be working on this.
I'll explain the situation: I have two textfields and one filefield (which is an image). Everytime the function is called to generate content, three images are generated instead of one (on the server and in the files table in the database).
I tried to see if the content would be generated correctly if I got rid of the first loop and that seemed to work..

..
if (!empty($type['fields'])) {
    //foreach ($type['fields'] as $field) {
      $node_field = array();
      ..

This might probably only work in my specific situation. Maybe there's someone who has a better solution?