Revert "toroplus vendor stuff"

This reverts commit d22224ba9ba4a6f052e22fbed262331f354ebd5b.