Revert "Fix for loop count issue when do_verify=0 (#1093)"