Backed out changeset ee50dac0cb7e (bug 1048747) for hazard failures