Revert back to omni's audio & audio-caf

These have no effect in solving the fence problem