Use vc-mode instead of my own utility