I agree, we shouldn't need to do the above 4 lines in every place that uses this downloader. We should put some thought into how to make this better.