Before, the client_id was being added to the URL in an error-prone way.
This patch now uses requests to add it to the main request URL. Also,
the original download request is now being used properly where before it
was possible for the stream URL to be used.