I think this is reverting some of the changes from when the FS branch landed... we shouldn't use the term "file entry" anymore here