Backed out changeset d50d7e88f35e (bug 1012951) for LSan failures