Hackaround, upstream style.

Omni doesn't have the caf frameworks merged/ifdef'd in yet, but has CAF branches in parallel.