Bug 870794. Back out patch for bug 859093. a=akeybl