Comment 2 for bug 1064679

We've been frustrated by this issue since coming to Evergreen, and finally have some working code to address it. I am assigning myself now, as our goal is to have the code in local production next week, and a branch should follow shortly after that.