Backed out changeset 3b0d1e17cad0 (bug 1055408) for bustage
Backed out changeset 55ea2c2fb857 (bug 1034368) for bustage