Backed out changeset 10a99a32304b (bug 991034) for startup crashes; CLOSED TREE