Backed out changeset 0b6f43cbb7dd (bug 899187) for causing a couple of new intermittent failures