Revert "move to new vendor config"

This reverts commit a1a27d708e2640581788d43795cadf85b645d2f7.

Change-Id: Id8a072778ba840c576ede4bacc7e945e5980ab8a