Backed out changeset f353f95ad293 (bug 1084157) for ASAN Test Bustage on a CLOSED TREE