Revert "Catch up with CM audio"

This reverts commit e38ff0274cfa83a3e846d2773037c6f4c47a491f.