diff -u b/modules/payment/src/Controller/PaymentCheckoutController.php b/modules/payment/src/Controller/PaymentCheckoutController.php
--- b/modules/payment/src/Controller/PaymentCheckoutController.php
+++ b/modules/payment/src/Controller/PaymentCheckoutController.php
@@ -7,7 +7,7 @@
 use Drupal\commerce_order\Entity\OrderInterface;
 use Drupal\commerce_payment\Exception\PaymentGatewayException;
 use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\OffsitePaymentGatewayInterface;
-use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsCreatingOffsitePaymentMethodsOnCheckoutInterface;
+use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsStoredPaymentMethodsInterface;
 use Drupal\Core\Access\AccessException;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -107,7 +107,7 @@
     $checkout_flow = $order->get('checkout_flow')->entity;
     $checkout_flow_plugin = $checkout_flow->getPlugin();
 
-    if ($payment_gateway_plugin instanceof SupportsCreatingOffsitePaymentMethodsOnCheckoutInterface) {
+    if ($payment_gateway_plugin instanceof SupportsStoredPaymentMethodsInterface) {
       try {
         $payment_method_storage = $this->entityTypeManager->getStorage('commerce_payment_method');
         /** @var \Drupal\commerce_payment\Entity\PaymentMethodInterface $payment_method */
@@ -125,7 +125,7 @@
           'payment_gateway_mode' => $payment_gateway_plugin->getMode(),
         ]);
         // In case payment gateway supports payment method.
-        $payment_gateway_plugin->createPaymentMethod($payment_method, $order, $request);
+        $payment_gateway_plugin->createPaymentMethod($payment_method, ['order' => $order, 'request' => $request]);
 
         // Add payment method to the order.
         $order->set('payment_method', $payment_method);
reverted:
--- b/modules/payment/src/Plugin/Commerce/PaymentGateway/SupportsCreatingOffsitePaymentMethodsOnCheckoutInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\commerce_payment\Plugin\Commerce\PaymentGateway;
-
-use Drupal\commerce_order\Entity\OrderInterface;
-use Drupal\commerce_payment\Entity\PaymentMethodInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Defines the interface for gateways which support storing payment methods.
- */
-interface SupportsCreatingOffsitePaymentMethodsOnCheckoutInterface {
-
-  /**
-   * Creates a payment method for the "return" request.
-   *
-   * @param \Drupal\commerce_payment\Entity\PaymentMethodInterface $paymentMethod
-   *   The payment method.
-   * @param \Drupal\commerce_order\Entity\OrderInterface $order
-   *   The order.
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request.
-   *
-   * @throws \Drupal\commerce_payment\Exception\PaymentGatewayException
-   *   Thrown when the transaction fails for any reason.
-   */
-  public function createPaymentMethod(PaymentMethodInterface $paymentMethod, OrderInterface $order, Request $request);
-
-}
diff -u b/modules/payment/src/Plugin/Commerce/PaymentGateway/SupportsStoredPaymentMethodsInterface.php b/modules/payment/src/Plugin/Commerce/PaymentGateway/SupportsStoredPaymentMethodsInterface.php
--- b/modules/payment/src/Plugin/Commerce/PaymentGateway/SupportsStoredPaymentMethodsInterface.php
+++ b/modules/payment/src/Plugin/Commerce/PaymentGateway/SupportsStoredPaymentMethodsInterface.php
@@ -15,7 +15,9 @@
    * @param \Drupal\commerce_payment\Entity\PaymentMethodInterface $payment_method
    *   The payment method.
    * @param array $payment_details
-   *   The gateway-specific payment details.
+   *   The gateway-specific payment details in case of an onsite gateway.
+   *   The order and the request (with keys 'order' and 'request') in case of
+   *   an offsite gateway.
    *
    * @throws \Drupal\commerce_payment\Exception\PaymentGatewayException
    *   Thrown when the transaction fails for any reason.
diff -u b/modules/payment_example/src/Plugin/Commerce/PaymentGateway/StoredOffsiteRedirect.php b/modules/payment_example/src/Plugin/Commerce/PaymentGateway/StoredOffsiteRedirect.php
--- b/modules/payment_example/src/Plugin/Commerce/PaymentGateway/StoredOffsiteRedirect.php
+++ b/modules/payment_example/src/Plugin/Commerce/PaymentGateway/StoredOffsiteRedirect.php
@@ -9,10 +9,10 @@
 use Drupal\commerce_payment\Exception\HardDeclineException;
 use Drupal\commerce_payment\PaymentMethodTypeManager;
 use Drupal\commerce_payment\PaymentTypeManager;
-use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsCreatingOffsitePaymentMethodsOnCheckoutInterface;
 use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsCreatingOffsitePaymentMethodsOnUserPageInterface;
 use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsCreatingPaymentInterface;
 use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsDeletingPaymentMethodsInterface;
+use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsStoredPaymentMethodsInterface;
 use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsUpdatingStoredPaymentMethodsInterface;
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -38,7 +38,7 @@
  *   },
  * )
  */
-class StoredOffsiteRedirect extends OffsiteRedirect implements SupportsCreatingOffsitePaymentMethodsOnCheckoutInterface, SupportsCreatingPaymentInterface, SupportsCreatingOffsitePaymentMethodsOnUserPageInterface, SupportsDeletingPaymentMethodsInterface, SupportsUpdatingStoredPaymentMethodsInterface {
+class StoredOffsiteRedirect extends OffsiteRedirect implements SupportsStoredPaymentMethodsInterface, SupportsCreatingPaymentInterface, SupportsCreatingOffsitePaymentMethodsOnUserPageInterface, SupportsDeletingPaymentMethodsInterface, SupportsUpdatingStoredPaymentMethodsInterface {
 
   use StringTranslationTrait;
 
@@ -93,7 +93,8 @@
   /**
    * {@inheritdoc}
    */
-  public function createPaymentMethod(PaymentMethodInterface $payment_method, OrderInterface $order, Request $request) {
+  public function createPaymentMethod(PaymentMethodInterface $payment_method, array $payment_details) {
+    $request = $payment_details['request'];
     $payment_method->card_type = CreditCard::detectType($request->query->get('cardprefix'))->getId();
     $payment_method->card_number = substr($request->query->get('cardnomask'), -4);
     $payment_method->card_exp_month = substr($request->query->get('cardexpdate'), 0, 2);