Import of files exported with 'fid' set fails

Steps to reproduce:

Site 1.
Precondition: do not configure module in any way (i.e do not set the file export path or mode)
1. Export nodes with image/file fields.
2. Create an archive of all of the files under files/ dir

Site 2.
1. Unpack the archive from above into files/ (i.e copy the files from site 1 to site 2)
2. Import the nodes (file or export code - doesn't matter)

Expected result:
Nodes and files get successfully imported

Actual result:
You get an error saying:

PDOException: SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry '' for key 'uri': INSERT INTO {file_managed} (filemime, filesize, status, timestamp, type, uuid) VALUES (:db_insert_placeholder_0, :db_insert_placeholder_1, :db_insert_placeholder_2, :db_insert_placeholder_3, :db_insert_placeholder_4, :db_insert_placeholder_5); Array ( [:db_insert_placeholder_0] => application/octet-stream [:db_insert_placeholder_1] => 0 [:db_insert_placeholder_2] => 1 [:db_insert_placeholder_3] => 1349437480 [:db_insert_placeholder_4] => application [:db_insert_placeholder_5] => fa1e21a1-0f4a-8b04-d5c2-af69f16bde86 ) in drupal_write_record() (line 7013 of /DRUPAL/includes/common.inc).

resulting from the fact that the exported file object has fid field set to a certain value (taken from site 1)
and drupal_write_record checks for that and tries to update the file instead of inserting it.

A patch attached, though there were some other notices during the import process it doesn't fix:

Notice: Trying to get property of non-object in file_entity_file_update() (line 63 of /DRUPAL/sites/all/modules/contrib/file_entity/file_entity.file.inc).

or

Notice: Undefined property: stdClass::$uri in file_entity_file_presave() (line 14 of /DRUPAL/sites/all/modules/contrib/file_entity/file_entity.file.inc).

probably related to file_entity module.