Removed USE_OLD_FS