Revert "variants in own branch"

This reverts commit 89c18a972f75f3678fcf7f2f7fda3f75ae290f1a.