Backed out changeset dc66d16f19c8 (bug 1052422) for hazard analysis failures