Revert "move to new vendor config"

This reverts commit 797d112c6f9ecf04703192dc28b07006ca0f7a54.

Change-Id: I7048fb52ee981e2d3aea1f02a6a85c20bb611095