Add back OmniSwitch