Backed out changeset d0a0127e099e (bug 880067)
Backed out changeset bdcd192bda52 (bug 880067) for bustage