Backed out changeset 7e0f13fbecd3 (bug 983610)
Backed out changeset 246f001547ac (bug 981085)
Backed out changeset 81f230994acd (bug 980502) for hopefully fixing gi tests