Revert #4962 vfs

In case we decide to prospone pull #4962 to I* I've prepared a revert