Revert changes to variants code

fix was already in branch it seems.