Backed out changeset 32fae6347905 (bug 1082141) for jstests failures