Bug 883129: partial backout of bug 878843

https://bugzilla.mozilla.org/show_bug.cgi?id=883129
— partial back-out of 08a9fc142