Back out bug 810644 for now to fix bug 827035, until we manage to fix bug 765780.  r=stuff-is-broken