[Bug 418080] vfolder breakage