Bug 873203 - Backout the patch for bug 814001, r=bz