Revert "move to new vendor config"

This reverts commit b705608c56cd9f5b1b1b86c700416708c971d4e7.

Change-Id: I54d88b48342c8fe34a340d72fd7ea33d2cc5ff08