Backed out changeset 883564cbc9a3 (bug 1058319) for gip test failures