Revert "Track our own vold"

This reverts commit 533e432a9be974127c1c592803b658d4c9680dab.