Revert "OmniSwitch (2/2)"

This reverts commit 00ec4ca019d164b6b84048e4549c92e4fe1bac1d.