#988054: The filefield_save_upload has a naming collision with nested types containing the same field name.