Backed out changeset fd9518344a23 (bug 1018551) for crashes