Backed out changeset 6d2ffe8dc046 (bug 981249) for Linux ASAN test failure