diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index f38af8a..a777332 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -7,7 +7,6 @@
 
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Environment;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Url;
 use Drupal\Core\Database\Database;
 use Drupal\Core\DrupalKernel;
@@ -134,21 +133,17 @@ function system_requirements($phase) {
   }
 
   // Test PHP version and show link to phpinfo() if it's available
-  $phpversion = $phpversion_label = phpversion();
+  $phpversion = phpversion();
   if (function_exists('phpinfo')) {
-    // $phpversion is safe and output of l() is safe, so this value is safe.
-    if ($phase === 'runtime') {
-      $phpversion_label = SafeMarkup::set($phpversion . ' (' . \Drupal::l(t('more information'), new Url('system.php')) . ')');
-    }
     $requirements['php'] = array(
       'title' => t('PHP'),
-      'value' => $phpversion_label,
+      'value' => $phpversion,
     );
   }
   else {
     $requirements['php'] = array(
       'title' => t('PHP'),
-      'value' => $phpversion_label,
+      'value' => $phpversion,
       'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, <a href="@phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array('@phpinfo' => 'https://www.drupal.org/node/243993')),
       'severity' => REQUIREMENT_INFO,
     );
@@ -166,7 +161,7 @@ function system_requirements($phase) {
   if (($phase === 'install' || \Drupal::database()->driver() === 'mysql') && !SystemRequirements::phpVersionWithPdoDisallowMultipleStatements($phpversion)) {
     $requirements['php'] = array(
       'title' => t('PHP (multiple statement disabling)'),
-      'value' => $phpversion_label,
+      'value' => $phpversion,
       'description' => t('PHP versions higher than 5.6.5 or 5.5.21 provide built-in SQL injection protection for mysql databases. It is recommended to update.'),
       'severity' => REQUIREMENT_INFO,
     );
@@ -415,8 +410,6 @@ function system_requirements($phase) {
     $threshold_warning = $cron_config->get('threshold.requirements_warning');
     // Cron error threshold defaults to two weeks.
     $threshold_error = $cron_config->get('threshold.requirements_error');
-    // Cron configuration help text.
-    $help = t('For more information, see the online handbook entry for <a href="@cron-handbook">configuring cron jobs</a>.', array('@cron-handbook' => 'https://www.drupal.org/cron'));
 
     // Determine when cron last ran.
     $cron_last = \Drupal::state()->get('system.cron_last');
@@ -435,24 +428,25 @@ function system_requirements($phase) {
 
     // Set summary and description based on values determined above.
     $summary = t('Last run !time ago', array('!time' => \Drupal::service('date.formatter')->formatTimeDiffSince($cron_last)));
-    $description = '';
-    if ($severity != REQUIREMENT_INFO) {
-      $description = t('Cron has not run recently.') . ' ' . $help;
-    }
-
-    $description .= ' ' . t('You can <a href="@cron">run cron manually</a>.', array('@cron' => \Drupal::url('system.run_cron')));
-    $description .= '<br />' . t('To run cron from outside the site, go to <a href="!cron">!cron</a>', array('!cron' => \Drupal::url('system.cron', array('key' => \Drupal::state()->get('system.cron_key'), array('absolute' => TRUE)))));
 
     $requirements['cron'] = array(
       'title' => t('Cron maintenance tasks'),
       'severity' => $severity,
       'value' => $summary,
-      // @todo This string is concatenated from t() calls, safe drupal_render()
-      //   output, whitespace, and <br /> tags, so is safe. However, as a best
-      //   practice, we should not use SafeMarkup::set() around a variable. Fix
-      //   in: https://www.drupal.org/node/2296929.
-      'description' => SafeMarkup::set($description),
     );
+    if ($severity != REQUIREMENT_INFO) {
+      $requirements['cron']['description'][] = ['#markup' => t('Cron has not run recently.')];
+      $requirements['cron']['description'][] = [
+        '#prefix' => ' ',
+        '#markup' => t('For more information, see the online handbook entry for <a href="@cron-handbook">configuring cron jobs</a>.', ['@cron-handbook' => 'https://www.drupal.org/cron']),
+        '#suffix' => ' ',
+      ];
+    }
+    $requirements['cron']['description'][] = ['#markup' => t('You can <a href="@cron">run cron manually</a>.', ['@cron' => \Drupal::url('system.run_cron')])];
+    $requirements['cron']['description'][] = [
+      '#prefix' => '<br />',
+      '#markup' => t('To run cron from outside the site, go to <a href="@cron">@cron</a>', ['@cron' => \Drupal::url('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]])]),
+    ];
   }
   if ($phase != 'install') {
     $filesystem_config = \Drupal::config('system.file');