No longer use specific variants for audio/media/diaplay