Revert "VC fix"

This reverts commit fd44a625feb6992b9761e032a0d65456f9dd3524.