Backed out changeset 168da3cbb27b (bug 1093688) for failing gip tests