diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
index 1cbc162..08a5062 100644
--- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
@@ -90,7 +90,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['uninstall'] = array(
       '#type' => 'table',
       '#header' => array(
-        'name' => array(
+        'title' => array(
           'data' => $this->t('Name'),
           'specifier' => 'name',
         ),
@@ -107,19 +107,10 @@ public function buildForm(array $form, array &$form_state) {
     );
 
     foreach ($uninstallable as $module) {
-      $name = $module->info['name'] ?: $module->name;
-
-      $checkboxId = 'edit-uninstall-'.$module->name;
-      $form['uninstall'][$module->name]['select'] = array(
-        '#id' => $checkboxId,
-        '#type' => 'checkbox',
-        '#title' => $this->t('Uninstall @module module', array('@module' => $name)),
-        '#title_display' => 'invisible',
-      );
 
-      $form['uninstall'][$module->name]['name']['#prefix'] = '<strong><label id="module-' . $module->name . '" for="' . $checkboxId . '" class="module-name table-filter-text-source">';
-      $form['uninstall'][$module->name]['name']['#markup'] = $name;
-      $form['uninstall'][$module->name]['name']['#suffix'] = '</label></strong>';
+      // Define <label> element for autogenerated checkbox.
+      $form['uninstall'][$module->name]['title']['#type'] = 'label';
+      $form['uninstall'][$module->name]['title']['#title'] = $module->info['name'] ?: $module->name;
 
       $form['uninstall'][$module->name]['description'] = array(
           '#markup' => $this->t($module->info['description']),
@@ -136,7 +127,7 @@ public function buildForm(array $form, array &$form_state) {
       foreach (array_keys($module->required_by) as $dependent) {
         if ($dependent != $profile && drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) {
           $name = isset($modules[$dependent]->info['name']) ? $modules[$dependent]->info['name'] : $dependent;
-          $form['uninstall'][$module->name]['select']['#disabled'] = TRUE;
+          $form['uninstall'][$module->name]['#disabled'] = TRUE;
           $required_modules[] = $name;
         }
       }