Revert "move to new vendor config"

This reverts commit e61fb316b0fd4d84c72b49cbe692df6909e6fd1e.

Change-Id: I035a173d06f37c0a3073481f4084e807fc23642e