Backed out changeset f6970e7f17e1 (bug 995284) for crashes on OS X and Windows; CLOSED TREE