Revert "VC_Register Changes"

This reverts commit 52706cff8a33bf3c425f967dbba6c0e31b8080f0, reversing
changes made to 30eb84773593d3deabc2c8184b2df438b25f48ea.
Revert "Revert "VC_Register Changes""

This reverts commit 234862182be4adbf1883064336143bd161fa9263.