Backout ce0afdc6ea1f (bug 1041688) for regressions.