Unrevert rpointer changes in #3067

[ekluzek]

We brought in #3067 to the b4b-dev branch, but there were problems in testing when it was being brought into master. So in 81b2dfa we reverted it. Since this was brought into a few different branches, it shows up in a few other later commits as well.

We need to un-revert this to get the correct behavior for restarts.

I'll add more information as I find it and get to it.

[ekluzek]

Linking this to #3351 which is essentially a duplicate of this, but it's also a parent for issues to resolve the problem. This issue is helpful to log the problems that we saw.

[ekluzek]

Here's the issue that documents the problems I was seeing originally:

#3098