Bug 880445 undo

note: do not merge this until https://bugzilla.mozilla.org/show_bug.cgi?id=872464 lands