release-gambit: Fix fee catchup after restart

[jbearer]

This is a backport of #2160 to release-gambit. It is a separate PR because it is not a clean cherry-pick. I recommend reviewing the main PR first, and then you can just look at this one to convince yourself it's doing the same thing.