Revert "More audio use case enhacements"

This reverts commit 259da182eaaa0f6d16e41a14454ba5c2b4e82229.