this may be good to upstream to AMO. see [bug 732502](https://bugzilla.mozilla.org/show_bug.cgi?id=732502).