Revert "WIP do not merge Bug 1025805 multiple RIDs over time"
Merge pull request #289 from mozilla/revert-282-bug1025805

Revert "WIP do not merge Bug 1025805 multiple RIDs over time"