Backed out changeset 796618164ade (bug 414071) for bustage.