Agree.
Additionally letting Apple (and other big companies)[0] clean up their own mess creates a perfectly aligned incentive to avoid messing with consumers again.
Edit: clarify
[0]: I actually like big companies. It's mostly just when they, -in spite of massive profits, do stupid things e.g: like whining against basic worker or consumer protection etc that they annoy me.