Reverted change to get_file_name; that's already covered by a different changeset