Revert "OmniSwitch (1/2)"

This reverts commit 6d11bfeef7cf606c9a741d97c500e322e1dc0d06.