Revert "Revert "Download url fix.""

This reverts commit f96e9e59e2fccb71c471f7e8a10f1dcb5482286d.
Revert "Revert "Download url fix.""

This reverts commit 7a141bb69e341b40b0d609d175ea663c61244b33.
Download url fix.