Backed out changeset d89a7ed61c19 (bug 1035396) for asan failures