Backed out changeset 3bfcf691690a (bug 966182) for adding a hazard.