I don't know if you've found this already, but after I had the same
problem and spent quite a lot of time trying to fix it, I found there is
now a blue revert button under the address once you go through the steps
of splitting the shipments and remov...