Revert 3abb553..894d123

This rolls back to commit 3abb553dbe298d67ca8c11b5d6c90c77142aaada.
Squashed Buggy

This seems to have gotten rid of the FTP upload bug. I don’t trust this
fix at all though… more testing is needed