diff --git a/debian/linux-base.templates b/debian/linux-base.templates
index fb9fe845e..b72f0d5c5 100644
--- a/debian/linux-base.templates
+++ b/debian/linux-base.templates
@@ -1,7 +1,7 @@
 Template: linux-base/disk-id-convert-auto
 Type: boolean
 Default: true
-_Description: Update disk device ids in system configuration?
+Description: Update disk device ids in system configuration?
  The new Linux kernel version provides different drivers for some
  PATA (IDE) controllers.  The names of some hard disk, CD-ROM and
  tape devices may change.
@@ -14,7 +14,7 @@ _Description: Update disk device ids in system configuration?
 Template: linux-base/disk-id-convert-plan
 Type: boolean
 Default: true
-_Description: Apply these configuration changes to disk device ids?
+Description: Apply these configuration changes to disk device ids?
  These devices will be assigned UUIDs or labels:
  .
  ${relabel}
@@ -30,7 +30,7 @@ _Description: Apply these configuration changes to disk device ids?
 Template: linux-base/disk-id-convert-plan-no-relabel
 Type: boolean
 Default: true
-_Description: Apply these configuration changes to disk device ids?
+Description: Apply these configuration changes to disk device ids?
  These configuration files will be updated:
  .
  ${files}
@@ -41,7 +41,7 @@ _Description: Apply these configuration changes to disk device ids?
 
 Template: linux-base/disk-id-manual
 Type: note
-_Description: Please check these configuration files before rebooting
+Description: Please check these configuration files before rebooting
  These configuration files still use some device names that may
  change when using the new kernel:
  .
@@ -49,7 +49,7 @@ _Description: Please check these configuration files before rebooting
 
 Template: linux-base/disk-id-manual-boot-loader
 Type: note
-_Description: Check the boot loader configuration before rebooting
+Description: Check the boot loader configuration before rebooting
  The boot loader configuration for this system was not recognised.  These
  settings in the configuration may need to be updated:
  .
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index 0953af326..000000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[type: gettext/rfc822deb] linux-base.templates
-[type: gettext/rfc822deb] templates/temp.image.plain/templates
diff --git a/debian/templates/temp.image.plain/templates b/debian/templates/temp.image.plain/templates
index 157824b8e..8be8fd222 100644
--- a/debian/templates/temp.image.plain/templates
+++ b/debian/templates/temp.image.plain/templates
@@ -1,7 +1,7 @@
 Template: =ST-image-=V/postinst/depmod-error-initrd-=V
 Type: boolean
 Default: false
-_Description: Abort installation after depmod error?
+Description: Abort installation after depmod error?
  The 'depmod' command exited with the exit code ${exit_value}
  (${SIGNAL}${CORE}).
  .
@@ -16,7 +16,7 @@ _Description: Abort installation after depmod error?
 Template: shared/kernel-image/really-run-bootloader
 Type: boolean
 Default: true
-_Description: Run the default boot loader?
+Description: Run the default boot loader?
  The default boot loader for this architecture is $loader, which is
  present.
  .
@@ -32,7 +32,7 @@ _Description: Run the default boot loader?
 
 Template: =ST-image-=V/postinst/bootloader-test-error-=V
 Type: note
-_Description: Error running the boot loader in test mode
+Description: Error running the boot loader in test mode
  An error occurred while running the ${loader} boot loader in test mode.
  .
  A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf
@@ -41,7 +41,7 @@ _Description: Error running the boot loader in test mode
 
 Template: =ST-image-=V/postinst/bootloader-error-=V
 Type: note
-_Description: Error running the boot loader
+Description: Error running the boot loader
  An error occurred while running the ${loader} boot loader.
  .
  A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf
@@ -51,7 +51,7 @@ _Description: Error running the boot loader
 Template: =ST-image-=V/prerm/removing-running-kernel-=V
 Type: boolean
 Default: true
-_Description: Abort kernel removal?
+Description: Abort kernel removal?
  You are running a kernel (version ${running}) and attempting to remove
  the same version.
  .
@@ -66,7 +66,7 @@ _Description: Abort kernel removal?
 Template: =ST-image-=V/prerm/would-invalidate-boot-loader-=V
 Type: boolean
 Default: true
-_Description: Abort kernel removal?
+Description: Abort kernel removal?
  This system uses a valid /etc/${loader}.conf file that mentions
  ${kimage}-=V. Removing =ST-image-=V will invalidate
  that file.
@@ -80,7 +80,7 @@ _Description: Abort kernel removal?
 
 Template: =ST-image-=V/postinst/missing-firmware-=V
 Type: note
-_Description: Required firmware files may be missing
+Description: Required firmware files may be missing
  This system is currently running Linux ${runningversion} and you are
  installing Linux ${version}.  In the new version some of the drivers
  used on this system may require additional firmware files: