Tweak download handler Closes #3394.