Hey

Here's my patch as previously, but with the SFTP download procedure restored
to the state James brought.

The same concept will have to be used for the SFTP upload as well but isn't
yet in this patch, and I don't mind leaving that until we commit this and can
work from that.

I still can't download anything SFTP with this, but I wasn't able to before
either so I don't think that's have to be because I broke anything.

Please have a test and possibly adjust, and then we can commit this and move
on to fix the uploading and I can debug my failed SFTP downloading more.