diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 033832c..9fe1ffa 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -93,18 +93,6 @@ function field_ui_theme() {
 }
 
 /**
- * Implements hook_element_info().
- */
-function field_ui_element_info() {
-  return array(
-    'field_ui_table' => array(
-      '#theme' => 'field_ui_table',
-      '#regions' => array('' => array()),
-    ),
-  );
-}
-
-/**
  * Implements hook_entity_type_build().
  */
 function field_ui_entity_type_build(array &$entity_types) {
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..6cfd57c
--- /dev/null
+++ b/core/modules/field_ui/src/Element/FieldUiTable.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\field_ui\Element\FieldUiTable
+ */
+
+namespace Drupal\field_ui\Element;
+
+use Drupal\Core\Render\Element\FormElement;
+
+/**
+ * Provides a field_ui table element.
+ *
+ * @FormElement("field_ui_table")
+ */
+class FieldUiTable extends FormElement {
+  /**
+   * {@inheritdoc}
+   */
+  function getInfo() {
+    return array(
+      '#theme' => 'field_ui_table',
+      '#regions' => array('' => array()),
+    );
+  }
+}
