Reverting incorrect implementation of #32 - Provide simpler testing of FeatureSwitch Types
Reverting incorrect implementation of #32 - Provide simpler testing of FeatureSwitch Types