Revert "Use old approach for when device is in speaker mode"

This reverts commit d6975114636a3093969a12c06354b8503cbb4ea6.