Revert "Speed up unpack_file_url"