Backout bug 876542 to fix regressions,a=leo+ (from bug 891142)