Backed out changeset 357883f2205b (bug 940040)