Remove dependency on FILE_DIR
Fix for #111