Some ruggedized laptops have two separate batteries for hot-swapping while keeping the PC on, and this way you can take a laptop with more than 100 Wh on a plane. The same way I take a 95 Wh laptop with a 75 Wh power bank. So never say never :)
As long as consumers are willing to shell out several thousand dollars per iteration of mistake-undoing then it's likely that some day you'll see actual progress.