Revert "Changes for Omni"

This reverts commit cd8afcf68c2ff98d50b7d4b6bffdd72b00d81f49.