diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 822a38c..f05f548 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -72,6 +72,8 @@ function field_ui_theme() {
 
 /**
  * Implements hook_element_info().
+ *
+ * @todo Remove once https://www.drupal.org/node/2326409 is in.
  */
 function field_ui_element_info() {
   return array(
diff --git a/core/modules/field_ui/src/Element/FieldUiTable.php b/core/modules/field_ui/src/Element/FieldUiTable.php
new file mode 100644
index 0000000..361a17e
--- /dev/null
+++ b/core/modules/field_ui/src/Element/FieldUiTable.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\field_ui\Element\FieldUiTable.
+ */
+
+namespace Drupal\field_ui\Element;
+
+use Drupal\Core\Render\Element\RenderElement;
+
+/**
+ * Provides a field_ui table element.
+ *
+ * @RenderElement("field_ui_table")
+ */
+class FieldUiTable extends RenderElement {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    return array(
+      '#theme' => 'field_ui_table',
+      '#regions' => array('' => array()),
+    );
+  }
+
+}
