Revert fix for CAF merge for OMNI

Revert fix for CAF merge for OMNI