Backed out changeset 4e3e7a20399f (bug 942207) for ASAN failures.
CLOSED TREE