Re-add unlimited download option

Fixes issue #2224