This adresses #26.

Revert "Merge remote-tracking branch 'refs/remotes/core/feature/vc' into patches"

This reverts commit 68d8b5a5, reversing
changes made to e8d207bb.