Revert "move to new vendor config"

This reverts commit 1b6c0dedc93f9f5c9fcdb893552df7aa73ff28ed.

Change-Id: Icbd634b27053929f9697f17682312b37186b4684