Backed out changeset 21d743a319c6 (bug 967475) for apparently introducing two hazards to the build