Comment 23 for bug 723999

I'm marking this qa-ok so that I don't block deployment; I won't know if it actually helps things until it makes it to staging, and it won't do that for another 9 hours or so.