Backed out changeset 976547bec292 (bug 984783) for ASAN failures.
CLOSED TREE