Revert "add omni switch"

This reverts commit 72dc5294bc738edf7f158db1ac5546c829353197.

Conflicts:
	default.xml