Back out patch for bug 852648. CLOSED TREE