Backed out changeset 716ba77a9d0a (bug 967005) for ASAN m-4 failures