Revert "move to new vendor config"

This reverts commit 402c3df6c35b388eb32b582621ae48e4161fa77b.

Change-Id: If2ba5875878855f21d2a208acefb0ef41fa8233e