[Filesystem] Fix regression introduced in 10dea948
merged branch stloyd/bugfix/fix_regression (PR #7944)

This PR was merged into the 2.1 branch.

Discussion
----------

[Filesystem] Fix regression introduced in 10dea94

This is one of ideas to fix the regression from 10dea948, @kachkaev what do you think?

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature? | no
| Tests pass?  | yes
| Fixed tickets | #7920
| License       | MIT

Commits
-------

e4913f8 [Filesystem] Fix regression introduced in 10dea948