Backed out changeset 80f77d10896b (bug 1013587) for crashes