diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index 74902be58..c23c04449 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -165,9 +165,6 @@ class Main(object):
     def update_flavour(self, config, arch, featureset, flavour):
         config_base = config.merge('base', arch, featureset, flavour)
 
-        if not config_base.get('modules', True):
-            return
-
         self.log("Updating ABI for arch %s, featureset %s, flavour %s: " % (arch, featureset, flavour))
         try:
             if featureset == 'none':
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index d3da5db4d..64e507250 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -24,7 +24,6 @@ class Gencontrol(Base):
         },
         'build': {
             'debug-info': config.SchemaItemBoolean(),
-            'modules': config.SchemaItemBoolean(),
             'vdso': config.SchemaItemBoolean(),
         },
         'description': {
@@ -362,13 +361,11 @@ class Gencontrol(Base):
         packages_own.append(image_main)
         packages_own.extend(self.process_packages(image[1:], vars))
 
-        if config_entry_build.get('modules', True):
-            makeflags['MODULES'] = True
-            package_headers = self.process_package(headers[0], vars)
-            package_headers['Depends'].extend(relations_compiler_headers)
-            packages_own.append(package_headers)
-            if extra.get('headers_arch_depends'):
-                extra['headers_arch_depends'].append('%s (= ${binary:Version})' % packages_own[-1]['Package'])
+        package_headers = self.process_package(headers[0], vars)
+        package_headers['Depends'].extend(relations_compiler_headers)
+        packages_own.append(package_headers)
+        if extra.get('headers_arch_depends'):
+            extra['headers_arch_depends'].append('%s (= ${binary:Version})' % packages_own[-1]['Package'])
 
         if config_entry_build.get('vdso', False):
             makeflags['VDSO'] = True
diff --git a/debian/rules.real b/debian/rules.real
index a2db24504..36a533b8d 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -62,9 +62,7 @@ binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 ifeq ($(DEBUG),True)
   binary-arch-flavour: install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 endif
-ifeq ($(MODULES),True)
-  binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-endif
+binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
 ifneq ($(DO_DOCS),False)
   binary-indep: install-doc
@@ -369,7 +367,6 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain:
 	+$(MAKE_SELF) \
 	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_dt \
 	  DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
-ifeq ($(MODULES),True)
 	+$(MAKE_CLEAN) -C $(DIR) modules_install DEPMOD='$(CURDIR)/debian/bin/no-depmod' INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) INSTALL_MOD_STRIP=1
 ifeq ($(DEBUG),True)
 	set -o pipefail; \
@@ -382,7 +379,6 @@ endif
 	rm -f $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build
 	rm -f $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/source
 	rm $(PACKAGE_DIR)/lib/firmware -rf
-endif
 	dh_installdebconf
 	+$(MAKE_SELF) \
 	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \
@@ -424,11 +420,9 @@ install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_
 	dh_installdirs usr/lib/debug usr/lib/debug/boot usr/share/lintian/overrides/
 	dh_lintian
 	install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION)
-ifeq ($(MODULES),True)
 	+$(MAKE_CLEAN) -C $(DIR) modules_install DEPMOD='$(CURDIR)/debian/bin/no-depmod' INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
 	find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+
 	rm $(DEBUG_DIR)/lib/firmware -rf
-endif
 ifeq ($(VDSO),True)
 	+$(MAKE_CLEAN) -C $(DIR) vdso_install INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
 # Create .build-id links.  Some architectures already do so, but in the
diff --git a/debian/templates/control.image.type-plain.in b/debian/templates/control.image.type-plain.in
index e2a95463c..9d7b6fba1 100644
--- a/debian/templates/control.image.type-plain.in
+++ b/debian/templates/control.image.type-plain.in
@@ -1,6 +1,5 @@
 Package: linux-image-@abiname@@localversion@
 Build-Profiles: <!stage1>
-Provides: linux-modules-@abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
 Depends: kmod, linux-base, ${misc:Depends}
 Recommends: firmware-linux-free, ${kernel:Recommends}
diff --git a/debian/templates/control.image.type-standalone.in b/debian/templates/control.image.type-standalone.in
deleted file mode 100644
index 8e132b65c..000000000
--- a/debian/templates/control.image.type-standalone.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: linux-image-@abiname@@localversion@
-Build-Profiles: <!stage1>
-Provides: linux-image
-Suggests: linux-doc-@version@
-Depends: ${misc:Depends}
-Description: Linux @upstreamversion@ for @class@
- The Linux kernel @upstreamversion@ for use on @longclass@.
diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in
index 7c4e94882..3ef30e534 100755
--- a/debian/templates/image.plain.postinst.in
+++ b/debian/templates/image.plain.postinst.in
@@ -28,7 +28,6 @@ my $image_dest      = "/";
 my $realimageloc    = "/boot/";
 my $have_conffile   = "";
 
-my $modules_base    = '/lib/modules';
 my $CONF_LOC        = '/etc/kernel-img.conf';
 
 # Ignore all invocations except when called on to configure.
@@ -477,9 +476,7 @@ sub system_failure_message {
   }
 }
 
-# We may not have any modules installed
-if (-d "$modules_base/$version" &&
-    system("depmod -a -F $realimageloc/System.map-$version $version")) {
+if (system("depmod -a -F $realimageloc/System.map-$version $version")) {
   die ("depmod failed: " . system_failure_message());
 }