Revert "Adiós Vendor!"

This reverts commit 1f3cf08fd7a122554de32a7ca66114cd2e2ba853.