Revert "Revert "Addressing breaking IFileSystem changes""

This reverts commit 5a815c13a9e4d9af5c220f4d041412d9bfaa1bb0.