Revert "track omniswitch"

This reverts commit ad4105a6f95f2f0cc783b5995b3487c183adb8a9.

Change-Id: I3c8a4508623770e40522b8d8018f05e28b5dd535