Backed out changeset 734a282006c2 (bug 915558) for causing topcrash bug 926427