Revert "Revert "Track my vendor"

This reverts commit 8480812cce6e537b0b964eb1fdf4bb55f3d53680.