Bug 887326. Back out fix for bug 876542. a=leo+