Please return the ability to disable speaker on mobile (use speaker toggle that used to be in voice and video options)

I like the new button in calls to toggle speaker mode on or off but I hate that it turns speaker on by default if I take off my headset. I miss the toggle in voice and video settings that forces the "use speaker" to be off, as sometimes my headset unplugs and the new update just auto makes the speaker turn on. I'd like both options. For now I downgraded my app just so it's still there.