Revert "Fix for audio routing to headset and earpiece"

This reverts commit 98fcb5d20c5932878a53377ae86129aeab0f65cb.