diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index f5c399f..fd25196 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -1090,24 +1090,14 @@ function template_preprocess_forum_list(&$variables) {
       $variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics;
     }
     $variables['forums'][$id]->last_reply = theme('forum_submitted', array('topic' => $forum->last_post));
-    // Cast num_posts and num_topics to strings to ensure the value can be
-    // printed in the template because Twig with strict variables off will not
-    // print int(0).
-    // @todo Remove the casting once http://drupal.org/node/1970960 is resolved.
-    $variables['forums'][$id]->num_posts = (string) $variables['forums'][$id]->num_posts;
-    $variables['forums'][$id]->num_topics = (string) $variables['forums'][$id]->num_topics;
   }
 
   $variables['pager'] = array(
    '#theme' => 'pager',
   );
 
-  // Cast forum_id to a string to ensure the value can be
-  // printed in the template because Twig with strict variables off will not
-  // print int(0).
-  // @todo Remove the casting once http://drupal.org/node/1970960 is resolved.
   // Give meaning to $tid for themers. $tid actually stands for term ID.
-  $variables['forum_id'] = (string) $variables['tid'];
+  $variables['forum_id'] = $variables['tid'];
   unset($variables['tid']);
 }
 
diff --git a/core/modules/forum/templates/forum-list.html.twig b/core/modules/forum/templates/forum-list.html.twig
index 135463d..fd55a77 100644
--- a/core/modules/forum/templates/forum-list.html.twig
+++ b/core/modules/forum/templates/forum-list.html.twig
@@ -27,9 +27,6 @@
  * - forum_id: Forum ID for the current forum. Parent to all items within the
  *   forums array.
  *
- * @todo Replace this with existing theme functions:
- *   http://drupal.org/node/1812684
- *
  * @see template_preprocess()
  * @see template_preprocess_forum_list()
  *