Release 2631

Reverts #2629

We are seeing jobs backing up in production; possibly related to this but I'm not sure why. I would expect to see more jobs as the events are sent asynchronously but I'm not sure why that would cause other jobs to fail. It could be that we need to punt the analytics jobs to a separate queue with lower priority.