fix cherry-pick derp and add OmniSwitch