Hack on native FS support a little