Variant Selector pick block does not reset variant type when picking original block

Variant Selector pick block does not reset variant type when picking original block #500