Backed out changeset 673b1f899184 (bug 856848) for bustage. a=backout