Revert "move to new vendor config"

This reverts commit 6de910f50e4de8760f4f6eb201030c2422658906.

Change-Id: Ibc2bf32aae611c27712900e2ead4b9d014673aae