Issue #2003950: On D7 branch unset the vid to make sure a new one is generated which will not conflict with an existing vid.
