Backed out changeset be0ae5640b90 (bug 1025069) for rc1 test failure