Backed out changeset c40e797b011f (bug 765285) for ASAN bustage. r=whyunsetc-nanyway