No question, removing swappable batteries was pretty brazenly consumer-hostile.

One of the main reasons I’m 100% on board with stuff like the Pinephone, at least in theory (just wish Linux phones were actually ready to be used as phones… maybe in another couple of years).