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/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'),
   );