Revert "Better download support"

This reverts commit 7b8c37170a98c27250da9ead8cf5fa8c6680524d.