Revert media-caf commit