Revert "move to new vendor config"

This reverts commit 60ada65e22d7556c1c1cd3f238eeed4876e08860.

Change-Id: I75b141e85d18c641799b15be0738a3e588f52355