Use old-fashioned vendor

Change-Id: Id7c5316cd1b0acc8911a1df3679f05981e736412