Revert r323935 as it broke the build
subr_witness.c:2577:4: error: use of undeclared identifier 'req'
req->oldidx = 0; ^