Remove vendor check (still need a better way of doing this)

Change-Id: I43128add33d89ea305a59b0d0f1abecc10958207