Revert "move to new vendor config"

This reverts commit 69d187a58b34f2974e8e96a01f4f100431b0fe01.

Change-Id: Ib2f8ae37fea2c7e80753ba8d8082d48340c8fb7f