Comment 4 for bug 1298824

I prepared a reversion upload which is now sitting in -unapproved for the release team's consideration. If there's a quick fix, we can of course reject this and fix it properly instead.