diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatFormController.php b/core/modules/filter/lib/Drupal/filter/FilterFormatFormController.php
index 11cd9b1..f3f4196 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterFormatFormController.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterFormatFormController.php
@@ -207,7 +207,6 @@ class FilterFormatFormController extends EntityFormController {
         watchdog('filter', 'Filter Format %label has been updated.', array('%label' => $format->label()), WATCHDOG_NOTICE, l(t('Edit'), 'admin/config/content/formats/' . $format->id()));
         break;
     }
-    $form_state['redirect'] = 'admin/config/content/formats';
   }
 
   /**
diff --git a/core/modules/php/php.install b/core/modules/php/php.install
index 70d0097..3252adc 100644
--- a/core/modules/php/php.install
+++ b/core/modules/php/php.install
@@ -14,7 +14,7 @@ function php_enable() {
   // reliable method to identify the format in an uninstall hook or in
   // subsequent clean installs.
   $format_exists = FALSE;
-  $filter_formats = entity_load_multiple('filter_formats');
+  $filter_formats = entity_load_multiple('filter_format');
   foreach ($filter_formats as $format) {
     if ($format->name == 'PHP code') {
       $format_exists = TRUE;