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

Reverts mozilla/login.webmaker.org#282