diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc
index 1a77bbb..69a6b4f 100644
--- a/core/modules/node/content_types.inc
+++ b/core/modules/node/content_types.inc
@@ -247,7 +247,7 @@ function node_type_form_validate($form, &$form_state) {
  * @see node_type_form_validate()
  */
 function node_type_form_submit($form, &$form_state) {
-  $type = $form_state['entity'];
+  $type = $form_state['controller']->getEntity();
   $variables = $form_state['values'];
 
   // Do not save settings from vertical tabs.