Backed out changeset 99d71c24a5df (bug 681138) for making the intermittent-failure worse