Revert "media-caf: Avoid collision"