Until https://bugzilla.mozilla.org/show_bug.cgi?id=946697 is resolved, I can't merge this in; don't want to cause any regressions.