Problems with undo

I’ve been experiencing problems with the Undo feature, it seems to batch together multiple actions into a single undo.

For example, if I moved a token and then painted a new area, if I hit undo, sometimes it will undo both of those actions together. I would much rather it not batch these items together and instead have them broken apart. I’m ok with hitting Undo a decent amount, if it means better control.