7530 Won't Charge after docking

Looks like the most recent thunderbolt dock firmware update fixed a lot of the known bugs, which is great, but now I have a new issue that is annoying.  After undocking the laptop no longer charges the battery when connected to a power supply.   I can resolve this by completely powering down, removing 8 screws on the bottom cover to access the battery and disconnecting the battery. . . .  but that's not a solid option when you leave the office and have to travel!

Anyone know of a different or more simple way to resolve this issue. . .  hopefully in the next 35min before the battery dies