Backed out changeset 5b56ebe80e22 (bug 1400438) for heap write hazard… …
…. r=backout Backs out #18574
