Matches the new upstream function signature and fixes previously broken
behavior; new solver code confirmed to work during restarts