Revert "clean up variant pin definition support"

This reverts commit 9982e3f38c7040ef6f4b9be96462da7892f0147a.