Switch to using oldcaf variant of audio and display