Revert "Add OmniSwitch to build"

TEMPORARY

This reverts commit 03fa4ddc3500e0c9636c8e803eeaa5f43bbc428c.