Backed out 3 changesets (bug 1054572) for being the apparent cause of ASAN m-3 leaks

Backed out changeset cbd1a7c4d0b0 (bug 1054572)
Backed out changeset 466d677dacc0 (bug 1054572)
Backed out changeset 8b49480288aa (bug 1054572)