Backed out changeset bab6f837fc64 (bug 1060540) for causing regressions