diff --git a/node_revision_delete.module b/node_revision_delete.module
index 7b216e6c8eb877d1e628941509c5b256c7ef2d1c..31640027d84f9794b43e9e7ba287291dc7d96fed 100644
--- a/node_revision_delete.module
+++ b/node_revision_delete.module
@@ -187,12 +187,10 @@ function node_revision_delete_form_node_type_form_builder($entity_type, NodeType
  * Implements hook_form_BASE_FORM_ID_alter().
  */
 function node_revision_delete_form_node_revision_delete_confirm_alter(&$form, FormStateInterface &$form_state, $form_id) {
-  // @TODO: Update the code once this issue was in core:
-  // https://www.drupal.org/project/drupal/issues/2730631 .
   // Get the node id from URL.
-  $nid = \Drupal::routeMatch()->getParameter('node');
+  $nid = \Drupal::routeMatch()->getRawParameter('node');
   // Get the revision id from URL.
-  $revision_id = \Drupal::routeMatch()->getParameter('node_revision');
+  $revision_id = \Drupal::routeMatch()->getRawParameter('node_revision');
 
   // Get list of revisions older than current revision.
   $revisions_before = \Drupal::service('node_revision_delete')->getPreviousRevisions($nid, $revision_id);
@@ -279,9 +277,9 @@ function node_revision_delete_form_node_revision_delete_confirm_alter(&$form, Fo
 function _node_revision_bulk_delete_submit(array &$form, FormStateInterface $form_state) {
   if ($form_state->getValue('delete_prior_revisions') == 1) {
     // Get the node id from URL.
-    $nid = \Drupal::routeMatch()->getParameter('node');
+    $nid = \Drupal::routeMatch()->getRawParameter('node');
     // Get the revision id from URL.
-    $revision_id = \Drupal::routeMatch()->getParameter('node_revision');
+    $revision_id = \Drupal::routeMatch()->getRawParameter('node_revision');
     // Get list of revisions older than current revision.
     $revisions_before = \Drupal::service('node_revision_delete')->getPreviousRevisions($nid, $revision_id);