Let’s wait for the final bill.

I do not thing we will return to user swappable batteries. It will just be easier to have a shop replace your battery. But that is just my guess. We do not know the final bill yet.