Revert "OmniSwitch (1/2)"

This reverts commit e33c8bab617e8c5219462888979b35b2ee7553e7.