Revert "Use CM vold"

This reverts commit f47baaf0ebc0b03d011420af9447b032f4204480.