diff --git a/core/includes/form.inc b/core/includes/form.inc
index f95d5a4..3330c7c 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -2169,6 +2169,8 @@ function form_process_autocomplete($element, &$form_state) {
 /**
  * Preprocesses variables for input templates.
  *
+ * Default template: input.html.twig.
+ *
  * @param array $variables
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
@@ -2178,7 +2180,7 @@ function form_process_autocomplete($element, &$form_state) {
 function template_preprocess_input(&$variables) {
   $element = $variables['element'];
   $variables['attributes'] = new Attribute($element['#attributes']);
-  $variables['children'] = (!empty($element['#children'])) ? $element['#children'] : '';
+  $variables['children'] = $element['#children'];
 }
 
 /**
diff --git a/core/modules/system/templates/input.html.twig b/core/modules/system/templates/input.html.twig
index 6a17a2a..11110fb 100644
--- a/core/modules/system/templates/input.html.twig
+++ b/core/modules/system/templates/input.html.twig
@@ -11,7 +11,5 @@
  *
  * @ingroup themeable
  */
- @todo: remove this file once http://drupal.org/node/1819284 is resolved.
- This is identical to core/modules/system/templates/container.html.twig
 #}
 <input{{ attributes }} />{{ children }}