Revert "Fix A2DP x1"

This reverts commit 7780607480364145d12b184c3b0332cab5c01f09.