Unbacked out changeset 19fe1e621c5c (bug 966182) because it didn't actually introduce the new hazard.