Backed out changeset 30521d0cc862 (bug 951999) for Gi failures.