diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 391f833e05..e2a52ee637 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -136,8 +136,8 @@ const m_option_t mplayer_opts[]={
     OPT_INTRANGE("x", screen_size_x, 0, 0, 4096),
     OPT_INTRANGE("y", screen_size_y, 0, 0, 4096),
     // set screen dimensions (when not detectable or virtual!=visible)
-    OPT_INTRANGE("screenw", vo_screenwidth, CONF_OLD, 0, 4096),
-    OPT_INTRANGE("screenh", vo_screenheight, CONF_OLD, 0, 4096),
+    OPT_INTRANGE("screenw", vo_screenwidth, CONF_NOSAVE, 0, 4096),
+    OPT_INTRANGE("screenh", vo_screenheight, CONF_NOSAVE, 0, 4096),
     // Geometry string
     {"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL},
     OPT_MAKE_FLAGS("force-window-position", force_window_position, 0),
diff --git a/m_config.c b/m_config.c
index 2752ced85f..0f5151aed5 100644
--- a/m_config.c
+++ b/m_config.c
@@ -236,8 +236,6 @@ m_config_push(m_config_t* config) {
       continue;
     if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE))
       continue;
-    if((co->opt->flags & M_OPT_OLD) && !(co->flags & M_CFG_OPT_SET))
-      continue;
     if(co->flags & M_CFG_OPT_ALIAS)
       continue;
 
diff --git a/m_option.h b/m_option.h
index ca70011393..58deb9be8a 100644
--- a/m_option.h
+++ b/m_option.h
@@ -347,12 +347,8 @@ struct m_option {
  */
 #define M_OPT_NOSAVE		(1<<5)
 
-/// \brief The \ref Config will emulate the old behavior by pushing the
-/// option only if it was set by the user.
-#define M_OPT_OLD		(1<<6)
-
 /// The option should be set during command line pre-parsing
-#define M_OPT_PRE_PARSE		(1<<7)
+#define M_OPT_PRE_PARSE		(1<<6)
 
 /// \defgroup OldOptionFlags Backward compatibility
 ///
@@ -365,7 +361,6 @@ struct m_option {
 #define CONF_NOCMD		M_OPT_NOCMD
 #define CONF_GLOBAL		M_OPT_GLOBAL
 #define CONF_NOSAVE		M_OPT_NOSAVE
-#define CONF_OLD		M_OPT_OLD
 #define CONF_PRE_PARSE		M_OPT_PRE_PARSE
 ///@}