WIP do not merge Bug 1025805 multiple RIDs over time

Opening the PR to discuss the work on this so far, and to check next steps.
This isn't being used, right?