Backed out changeset 94a046dfcb49 (bug 1115388)
Backed out changeset d8a111f0fb64 (bug 1115388)
Backed out changeset 1c9c64027cac (bug 1115387) for bustage on a CLOSED TREE