diff -Nru console-setup-1.108ubuntu4/debian/changelog console-setup-1.108ubuntu5/debian/changelog
--- console-setup-1.108ubuntu4/debian/changelog	2015-03-11 14:36:01.000000000 +0000
+++ console-setup-1.108ubuntu5/debian/changelog	2015-04-22 07:35:19.000000000 +0000
@@ -1,3 +1,13 @@
+console-setup (1.108ubuntu5) vivid; urgency=medium
+
+  * Reinstate checking for XKBLAYOUT being in the config file: this handles
+    the cases where installs done with ubiquity don't have their debconf seen
+    flag set for model/layout questions. If layout is already configure, lower
+    the corresponding question's priority to medium so we don't ask it again.
+    (LP: #1446231)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 21 Apr 2015 17:19:21 -0400
+
 console-setup (1.108ubuntu4) vivid; urgency=medium
 
   * Add systemd unit for console-setup. That avoids waiting for $remote_fs
diff -Nru console-setup-1.108ubuntu4/debian/keyboard-configuration.config console-setup-1.108ubuntu5/debian/keyboard-configuration.config
--- console-setup-1.108ubuntu4/debian/keyboard-configuration.config	2015-03-02 22:32:54.000000000 +0000
+++ console-setup-1.108ubuntu5/debian/keyboard-configuration.config	2015-04-22 07:35:19.000000000 +0000
@@ -1012,15 +1012,30 @@
 # Load the config file, if it exists.  Overwrite the current values of
 # XKBMODEL, XKBLAYOUT, XKBVARIANT, etc. in the process.
 default_model="$XKBMODEL"
+layout_in_configfile=
 if [ -e $OLDCONFIGFILE ]; then
     . $OLDCONFIGFILE || true
+    if grep -qs '^ *XKBLAYOUT=' "$OLDCONFIGFILE"; then
+        layout_in_configfile=1
+    fi
 fi
 if [ -e $CONFIGFILE ]; then
     . $CONFIGFILE || true
+    if grep -qs '^ *XKBLAYOUT=' "$CONFIGFILE"; then
+        layout_in_configfile=1
+    fi
 fi
 if [ -z "$XKBMODEL" ]; then
     XKBMODEL="$default_model"
 fi
+if [ "$layout_in_configfile" ] && [ ! -d /lib/debian-installer ]; then
+    # console-setup-udeb (<< 1.53) didn't set the seen flag for our
+    # questions in the installed system, so we need to make sure not to ask
+    # questions again unnecessarily in most cases.  We can't do this in d-i
+    # because that makes it impossible to go back and change keyboard
+    # configuration.
+    layout_priority=medium
+fi
 
 XKBMODEL=$(echo $XKBMODEL | sed 's/ *//g')
 XKBLAYOUT=$(echo $XKBLAYOUT | sed 's/ *//g')