Revert "move to new vendor config"

This reverts commit a90706de85e550c22d61beb7fdfa228419c94e46.

Change-Id: I3bffd70f44d631e62e1b77be723c6fda1f3e1012