Revert "move to new vendor config"

This reverts commit fb9ba0307e32e56b97c21ac29ed5c87d98aacca2.

Change-Id: I022c5efd86c9558e84bc53b5fd01f2436cad33bf