Revert VFS and fmt::merge