Revert "move to new vendor config"

This reverts commit b91983d4991f77095cc6dc9522233f8a07a91be1.

Change-Id: I5e32947f07b1625bdee64b0bbbc41e26903aabd3