Revert "move to new vendor config"

This reverts commit f617980e928a0777ccf7804f6e98b30d4b8c8c7d.

Change-Id: I909d029173458950d386ab009a2c1e1d6087a2bc