Backout bug 1072980 due to regressions.