Backed out changeset 98fa8afd9169 (bug 1038357) for causing merge conflicts due startup crash backout