Backed out changeset 9d1b8acf821d for tart crashes (bug 1026561)