Backed out changeset eef487a50fb0 (bug 1079303)

--HG--
extra : rebase_source : 62c4e6effbf055472c0e7256a4f8882c0b95fa9c
Backed out changeset 577fdd522d0c (bug 1079303) because of ASAN perma-orange as well as orange on a seemingly unrelated test going much more frequent

--HG--
extra : rebase_source : 52d54012d2423689e08e213e4ae1f313ffacfe6e