Backed out changeset 0096df4879f7 (bug 995777) for rc2 test failures