Revert "move to new vendor config"

This reverts commit 95d41bfbd5ecdda30e8b64711f3f36a84b9f0d9d.

Change-Id: I67aefe0a733e90b8405e4f182b905b1696cddc1e