backout 8f33ef762433 (Bug 985967) for regressions. r=backout