Backing out 6d28e030fd7b (bug 1058180) due to causing crashes on desktop on a CLOSED TREE