diff --git a/core/includes/common.inc b/core/includes/common.inc
index 5387f71..b94d828 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -4741,12 +4741,6 @@ function drupal_render(&$elements) {
     }
   }
 
-  // If #markup is set, ensure #type is set. This allows to specify just #markup
-  // on an element without setting #type.
-  if (isset($elements['#markup']) && !isset($elements['#type'])) {
-    $elements['#type'] = 'markup';
-  }
-
   // If the default values for this element have not been loaded yet, populate
   // them.
   if (isset($elements['#type']) && empty($elements['#defaults_loaded'])) {
diff --git a/core/modules/block/custom_block/custom_block.pages.inc b/core/modules/block/custom_block/custom_block.pages.inc
index a0dc773..6fa4b81 100644
--- a/core/modules/block/custom_block/custom_block.pages.inc
+++ b/core/modules/block/custom_block/custom_block.pages.inc
@@ -95,7 +95,6 @@ function custom_block_delete_form($form, &$form_state, CustomBlock $block) {
   $instances = $block->getInstances();
 
   $form['message'] = array(
-    '#type' => 'markup',
     '#markup' => format_plural(count($instances), 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instances.'),
     '#access' => !empty($instances),
   );
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 65b15e5..f649f22 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -965,7 +965,6 @@ function file_managed_file_process($element, &$form_state, $form) {
       }
       else {
         $element['file_' . $delta]['filename'] = array(
-          '#type' => 'markup',
           '#markup' => theme('file_link', array('file' => $file)) . ' ',
           '#weight' => -10,
         );
diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc
index 705bcf3..5946959 100644
--- a/core/modules/image/image.field.inc
+++ b/core/modules/image/image.field.inc
@@ -344,7 +344,6 @@ function image_field_widget_process($element, &$form_state, $form) {
     }
 
     $element['preview'] = array(
-      '#type' => 'markup',
       '#markup' => theme('image_style', $variables),
     );
 
diff --git a/core/modules/layout/layout.admin.inc b/core/modules/layout/layout.admin.inc
index fac4370..53ac47b 100644
--- a/core/modules/layout/layout.admin.inc
+++ b/core/modules/layout/layout.admin.inc
@@ -27,7 +27,6 @@ function layout_page_view($key) {
     $regions[$region] = '<div class="layout-region-demonstration">' . check_plain($info['label']) . '</div>';
   }
   $build['demonstration'] = array(
-    '#type' => 'markup',
     '#markup' => $instance->renderLayout(TRUE, $regions),
   );
   $build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.css';
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
index 70406e8..d530936 100644
--- a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
+++ b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
@@ -167,7 +167,6 @@ public function viewElements(EntityInterface $entity, $langcode, array $items) {
 
       if (!empty($settings['url_only']) && !empty($settings['url_plain'])) {
         $element[$delta] = array(
-          '#type' => 'markup',
           '#markup' => check_plain($link_title),
         );
       }
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 211b79e..37af138 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -540,9 +540,6 @@ function system_element_info() {
   $types['value'] = array(
     '#input' => TRUE,
   );
-  $types['markup'] = array(
-    '#markup' => '',
-  );
   $types['link'] = array(
     '#pre_render' => array('drupal_pre_render_link'),
   );
diff --git a/core/modules/system/tests/modules/plugin_test/plugin_test.module b/core/modules/system/tests/modules/plugin_test/plugin_test.module
index 45f89cf..27fc614 100644
--- a/core/modules/system/tests/modules/plugin_test/plugin_test.module
+++ b/core/modules/system/tests/modules/plugin_test/plugin_test.module
@@ -40,7 +40,6 @@ function plugin_test_definitions() {
   $output = array();
   foreach($manager->getDefinitions() as $plugin_id => $definition) {
     $output[$plugin_id] = array(
-      '#type' => 'markup',
       '#markup' => $definition['label'],
     );
   }
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index c7502a2..f9ca87b 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -257,7 +257,6 @@ function update_manager_update_form($form, $form_state = array(), $context) {
     $prefix = '<h2>' . t('Manual updates required') . '</h2>';
     $prefix .= '<p>' . t('Updates of Drupal core are not supported at this time.') . '</p>';
     $form['manual_updates'] = array(
-      '#type' => 'markup',
       '#markup' => theme('table', array('header' => $headers, 'rows' => $projects['manual'])),
       '#prefix' => $prefix,
       '#weight' => 120,
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index fe5a233..49c8867 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -1231,7 +1231,6 @@ function views_form_views_form($form, &$form_state, ViewExecutable $view, $outpu
   // Add the output markup to the form array so that it's included when the form
   // array is passed to the theme function.
   $form['output'] = array(
-    '#type' => 'markup',
     '#markup' => $output,
     // This way any additional form elements will go before the view
     // (below the exposed widgets).