Now we use never_reset which is generally more correct and easier to get right. Fixes #5001 and fixes #4997
This can be enforced by pre-commit, but correct it separately to make it easier to review.