Revert "move to new vendor config"

This reverts commit a835656a155045c8e9892859649de5c443df6c8b.

Change-Id: Ia2ba1cd625d1047443ad61c34e6bf13de36e9156