Backed out changeset d9452857a6d2 (bug 823559 backout) for causing permaleaks on OSX. a=backout