Adapt to changes in AbstractFSProvider
Adapt to changes in AbstractFSProvider