diff --git a/lib/utils.pm b/lib/utils.pm
index 3e674845..94a0d980 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -867,23 +867,21 @@ sub gnome_initial_setup {
         @nexts = ('language', 'keyboard');
     }
     if ($args{prelogin}) {
-        # On releases that use anaconda gtkui, we configure g-i-s to
-        # skip 'language', 'keyboard' and 'timezone' using a custom
-        # vendor.conf:
+        # On releases that use anaconda gtkui on live images, we
+        # configure g-i-s to skip 'language', 'keyboard' and 'timezone'
+        # using a custom vendor.conf:
         # https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy
         # https://bugzilla.redhat.com/show_bug.cgi?id=1474787 ,
         # but 'language' is never *really* skipped (see above)
-        unless (get_var("_ANACONDA_WEBUI")) {
+        if ($relnum < 42) {
             @nexts = grep { $_ ne 'keyboard' } @nexts;
             @nexts = grep { $_ ne 'timezone' } @nexts;
         }
-        # On releases that use anaconda-webui, we use vendor.conf to
-        # skip 'language' and 'keyboard' (meaning 'language' is turned
-        # into 'welcome' and 'keyboard' is really skipped) on live
-        # installs because we saw them already. network installs and
-        # disk image deployments will show these screens (which is good
-        # for disk image deployments, but redundant for network
-        # installs)
+        # if g-i-s ran before anaconda (as expected on the live + webui
+        # flow), anaconda forwards a g-i-s state file to the installed
+        # system, causing it to skip 'language' and 'keyboard' (meaning
+        # 'language' is turned into 'welcome' and 'keyboard' is really
+        # skipped)
         if (match_has_tag "start_setup") {
             # if we saw start_setup, that means 'language' was skipped
             # and we can assume 'keyboard' will also be skipped