Bug #2932: revert changes to libfs.sh and downloader.sh

This is because the new code is not robust and fails under some
circumstances during the testing procedure. This should be fixed at some
point