Revert "move to new vendor config"

This reverts commit 0d7cf94dd6fded87254691e98727fcac75889dfc.

Change-Id: I34ae6ff3ed105a4cc08b5aaa020f2750309adca4