CC @gruehle @iwehrman for the filesystem API change