diff --git a/core/modules/translation_entity/translation_entity.install b/core/modules/translation_entity/translation_entity.install
index 5a1e948..83b50b9 100644
--- a/core/modules/translation_entity/translation_entity.install
+++ b/core/modules/translation_entity/translation_entity.install
@@ -6,33 +6,6 @@
  */
 
 /**
- * Implements hook_requirements().
- */
-function translation_entity_requirements($phase) {
-  $requirements = array();
-  $t = get_t();
-
-  if ($phase == 'runtime') {
-    $entity_types = translation_entity_types_translatable();
-    foreach (entity_get_info() as $entity_type => $info) {
-      if (translation_entity_enabled($entity_type)) {
-        if (!isset($entity_types[$entity_type])) {
-          $label = isset($info['label']) ? $info['label'] : $entity_type;
-          $t_args = array('@entity_type' => $label);
-          $requirements['translation_entity_' . $entity_type] = array(
-            'title' => $t('@entity_type translation', $t_args),
-            'value' => $t('The entities of type @entity_type do not define a valid base path: it will not be possible to translate them.', $t_args),
-            'severity' => REQUIREMENT_WARNING,
-          );
-        }
-      }
-    }
-  }
-
-  return $requirements;
-}
-
-/**
  * Implements hook_schema().
  */
 function translation_entity_schema() {
@@ -83,6 +56,8 @@ function translation_entity_schema() {
  * Implements hook_install().
  */
 function translation_entity_install() {
+  // Assign a fairly low weight to ensure our implementation of
+  // hook_module_implements_alter() is run among the last ones.
   module_set_weight('translation_entity', 10);
   language_negotiation_include();
   language_negotiation_set(LANGUAGE_TYPE_CONTENT, array(LANGUAGE_NEGOTIATION_URL => 0));
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index 8f51f19..3380b8e 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -208,6 +208,8 @@ function translation_entity_menu_alter(array &$items) {
           $items["$path/translations/add/%language/%language"],
           $items["$path/translations/delete/%language"]
         );
+        $t_args = array('@entity_type' => isset($info['label']) ? $info['label'] : $entity_type);
+        watchdog('entity translation', 'The entities of type @entity_type do not define a valid base path: it will not be possible to translate them.', $t_args, WATCHDOG_WARNING);
       }
       else {
         $entity_position = count(explode('/', $path)) - 1;
@@ -672,9 +674,9 @@ function translation_entity_form_field_ui_field_settings_form_alter(array &$form
       '#title' => t('Users may translate this field.'),
       '#default_value' => $translatable,
     );
-    $variables = array('element' => array('#title' => $label, '#title_display' => FALSE));
-    $form['field']['translatable']['#prefix'] = theme('form_element_label', $variables);
   }
+
+  $form['field']['translatable']['#weight'] = 20;
 }
 
 /**