Backed out changeset 0ec9bd8e9880 (bug 1044020) for asan failures