Revert "Added vendor-common back"

This reverts commit 82a6dfab6356e35da77ec1758f3bab0cac97bb81.