Comment 6 for bug 850461

I've now done some holds testing, and so far, so good. I'm assigning myself and will commit to master assuming it passes a fresh-eyes test tomorrow or (more likely) Monday.