Backed out changeset 7412a3a5f4cc (bug 914498) for bustage