backout 8ff6b2bf34cd (bug 989094) for regressions. r=backout