I've opened [bug 963476](https://bugzilla.mozilla.org/show_bug.cgi?id=963476) for this and will remove it from this pull.