Revert "FileUtils fixes"

This reverts commit eb2d20ba494c47f06a80fc036018a6d53290a7c4.