Revert "Merge branch 'CHEF-1031'"

This reverts commit a82935b4a8e1e8174d02e83259f07ea9926dd007, reversing
changes made to 464087c7a6da4ed51237cbb6ff39e45feeae0ecd.

Conflicts:
	lib/chef/provider/remote_file/ftp.rb