Rather than automatically select VC when pinning, just advertise it

Closes #1555