Back out bd0463063293 (bug 982379) for making a more frequent bug 981361 failure in a slightly different place