Backout 4158a1e1ddf9 (bug 1029059) for breaking jstests running