core/includes/common.inc |    3 ++-
 core/includes/menu.inc   |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/includes/common.inc b/core/includes/common.inc
index ff13861..404bdfc 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -3563,9 +3563,10 @@ function drupal_prepare_page($page) {
   drupal_alter('page', $page);
 
   // The "main" and "secondary" menus are never part of the page-level render
-  // array and therefor their cache tags will never bubble up into the page
+  // array and therefore their cache tags will never bubble up into the page
   // cache, even though they should be. This happens because they're rendered
   // directly by the theme system.
+  // @todo Remove this once https://drupal.org/node/1869476 lands.
   if (theme_get_setting('features.main_menu') && count(menu_main_menu())) {
     $main_links_source = _menu_get_links_source('main_links', 'main');
     $page['page_top']['#cache']['tags']['menu'][$main_links_source] = $main_links_source;
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 814c9d9..bc80d21 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1795,7 +1795,6 @@ function menu_secondary_menu() {
  */
 function _menu_get_links_source($name, $default) {
   $config = \Drupal::config('menu.settings');
-  // When menu module is not enabled, we need a hardcoded default value.
   return \Drupal::moduleHandler()->moduleExists('menu') ? $config->get($name) : $default;
 }