Should have been part of [15755]: Cursed vc-dir interface