diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index a63200c..40b636c 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -189,5 +189,8 @@ function config_test_entity_disable(ConfigTest $config_test) {
  * Implements hook_entity_info_alter().
  */
 function config_test_entity_info_alter(&$entity_info) {
+  // The 'translatable' entity key is not supposed to change over time. In this
+  // case we can safely do it because we set it once and we do not change it for
+  // all the duration of the test session.
   $entity_info['config_test']['translatable'] = Drupal::service('state')->get('config_test.translatable');
 }
diff --git a/core/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc
index ffea445..8e5ee39 100644
--- a/core/modules/field/field.multilingual.inc
+++ b/core/modules/field/field.multilingual.inc
@@ -29,17 +29,9 @@
  * The available language codes for a particular field are returned by
  * field_available_languages(). Whether a field is translatable is determined by
  * calling field_is_translatable(), which checks the $field['translatable']
- * property returned by field_info_field(), and whether there is at least one
- * translation handler available for the field. A translation handler is a
- * module registering itself via hook_entity_info_alter() to handle field
- * translations.
+ * property returned by field_info_field() and whether the entity type the field
+ * is attached to supports translation.
  *
-
- * By default, _field_invoke() and _field_invoke_multiple() are processing a
- * field in all available languages, unless they are given a language code
- * suggestion. Based on that suggestion, _field_language_suggestion() determines
- * the languages to act on.
-
  * By default, _field_invoke() and _field_invoke_multiple() process a field in
  * all available languages, unless they are given a language code suggestion.
  * Based on that suggestion, _field_language_suggestion() determines the