Revert "move to new vendor config"

This reverts commit eca4ce80caf95459c159555e07148a8c0fde4f8f.

Change-Id: I83398e344c27e38ae27c4770ef0122a378fed4df