Backed out changeset 25ea9ac37380 (bug 828176) for crashes.