I think the first commit expected to not change FileStore codes, there exists another way to reconstruct KeyValueDB init here.