Revert d663049..59287e7

This rolls back to commit d6630491873f811f7c44a9741ca10fe0e8ebe274.
Added separate FTP thread