Backed out changeset 2acbf923b6a8 (bug 650161) for causing hazards