Revert "Stop defaulting vendor to 'fpm' and only append vendor and revision to"

This reverts commit 25226b371baaf60830b1eca71603d8e7741fb639.