Revert "move to new vendor config"

This reverts commit 4e772e2e8f540d00fa4ecc52b5a3c409d6ce87bf.

Change-Id: Id2bae79971221a6f7fc48a350a7036df42b4ab5c