Allow vendor changes during upgrade