Preliminary Grid-FS support (breaks uploads)