This change allows us to use file_identifier_hash to find the correct
diff_file when there are more than one with the same file_path