Revert "move to new vendor config"

This reverts commit 174623a557786c85b39d085a2f59fd2d2ff3697c.

Change-Id: I3b61920119be71ab758e86a844c2705104ed4460