Changing this would be outside of the scope of this bug, and could have unexpected side effects. I want to keep this as simple as possible, so I filed [bug 868344](https://bugzilla.mozilla.org/show_bug.cgi?id=868344).