I ended up just disabling the one on mine
After a lot of panic and powering down on an upgrade screen without a 'no' button I went to the bios and found my setting reset. Then I put a group policy in place not allowing such despicable behaviour.
It's such a widely hated behaviour that tv shows take the piss out of them for it: https://youtu.be/2zpCOYkdvTQ?si=_qGffU2M3k847C3H&t=8