Revert "OmniSwitch (2/2)"

This reverts commit 72189abebbea53ec23b34fa1336eaaa4ec475179.