Comment 5 for bug 385879

I want to reclassify this as not a blocker for 2.0 because it seems likely there will be more bugs here, necessitating either individual squashing or a larger systematic change. That's worth doing, and worth doing in the 2.0 series, but not something I want to block 2.0 on.