Revert "move to new vendor config"

This reverts commit 4fba59f356c6873c93ff4199a9d7054dbe4fab80.

Change-Id: Ib5ededd751c86b28c8d2e469fa1dbe8b06198552