Revert "move to new vendor config"

This reverts commit 56d37ea29fe0b648ede0c3c916c878924d75d81f.

Change-Id: I55261b85881694cf68268ff8078217f2b71a8ea5