Backed out changeset e0da2d69cfdb (bug 1020257) for causing Gi Test Regressions