diff --git a/src/option.c b/src/option.c
index 35529a5..d5d20d7 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3680,7 +3680,6 @@
 		    && curbuf->b_term != NULL && !term_is_finished(curbuf))))
     {
 	curbuf->b_p_ma = FALSE;
-	args->os_doskip = TRUE;
 	return e_cannot_make_terminal_with_running_job_modifiable;
     }
 # endif
@@ -3942,7 +3941,6 @@
 	if (win->w_p_pvw && win != curwin)
 	{
 	    curwin->w_p_pvw = FALSE;
-	    args->os_doskip = TRUE;
 	    return e_preview_window_already_exists;
 	}
 
@@ -4130,7 +4128,6 @@
 	    !has_vtp_working())
     {
 	p_tgc = 0;
-	args->os_doskip = TRUE;
 	return e_24_bit_colors_are_not_supported_on_this_environment;
     }
     if (is_term_win32())
@@ -4602,7 +4599,7 @@
 	args.os_newval.boolean = value;
 	args.os_errbuf = NULL;
 	errmsg = options[opt_idx].opt_did_set_cb(&args);
-	if (args.os_doskip)
+	if (errmsg != NULL)
 	    return errmsg;
     }
 
diff --git a/src/structs.h b/src/structs.h
index 3696874..4e081b8 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -4948,10 +4948,6 @@
 	char_u	*string;
     } os_newval;
 
-    // When set by the called function: Stop processing the option further.
-    // Currently only used for boolean options.
-    int		os_doskip;
-
     // Option value was checked to be safe, no need to set P_INSECURE
     // Used for the 'keymap', 'filetype' and 'syntax' options.
     int		os_value_checked;
diff --git a/src/version.c b/src/version.c
index e136a67..83ac9db 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2086,
+/**/
     2085,
 /**/
     2084,