Revert "move to new vendor config"

This reverts commit 08c7259235f03ff3b0e22d149aa350bdeaadf5ac.

Change-Id: Id32b782217130308ac4a8b644f0e41fd618ceba9