Back out 3d8d5d2cb384 (bug 980835) and 47bce8cc31b4 (bug 757866) for test failures