Comment 18 for bug 2031482

I'm reverting the backport for 3.3 for now. We've released 3.4.2 without this fix, and not it turns out that we land some more fixes to 3.3. in order to release 3.3.7.

We don't want to land a fix in 3.3.7 that isn't in the latest 3.4 release.

I'll re-land the backport after 3.3.7 is released.