Bug 877160: Backout patch for bug 794693 due to regressions. [r=mats]