diff --git a/src/PaymentManager.php b/src/PaymentManager.php
index 64545d8..463f76c 100644
--- a/src/PaymentManager.php
+++ b/src/PaymentManager.php
@@ -112,13 +112,11 @@ class PaymentManager implements PaymentManagerInterface {
   /**
    * Gets the current time.
    *
-   * @todo Replace with time service in 8.3.x.
-   *
    * @return int
    *   The current request time.
    */
   protected function getTime() {
-    return (int) $_SERVER['REQUEST_TIME'];
+    return \Drupal::time()->getRequestTime();
   }
 
   /**
@@ -225,7 +223,6 @@ class PaymentManager implements PaymentManagerInterface {
 
     if ($status === 'authorized') {
       $transition = $payment->getState()->getWorkflow()->getTransition('authorize');
-      $payment->setAuthorizedTime($this->getTime());
       $payment->getState()->applyTransition($transition);
     }
     elseif ($status === 'capture') {
@@ -234,7 +231,6 @@ class PaymentManager implements PaymentManagerInterface {
       }
       $capture_transition = $payment->getState()->getWorkflow()->getTransition('capture');
       $payment->getState()->applyTransition($capture_transition);
-      $payment->setCapturedTime($this->getTime());
     }
     $payment->save();
 
diff --git a/tests/src/Functional/ReturnPageTest.php b/tests/src/Functional/ReturnPageTest.php
index c3adf13..e96ccf4 100644
--- a/tests/src/Functional/ReturnPageTest.php
+++ b/tests/src/Functional/ReturnPageTest.php
@@ -97,7 +97,7 @@ class ReturnPageTest extends OrderBrowserTestBase {
 
     $arguments = [
       'ORDER_NUMBER' => $order->id(),
-      'TIMESTAMP' => REQUEST_TIME,
+      'TIMESTAMP' => \Drupal::time()->getRequestTime(),
       'PAID' => random_int(12345, 23456),
       'METHOD' => 1,
     ];
@@ -126,7 +126,7 @@ class ReturnPageTest extends OrderBrowserTestBase {
     // Test nofitifcation.
     $arguments2 = [
       'ORDER_NUMBER' => 5,
-      'TIMESTAMP' => REQUEST_TIME,
+      'TIMESTAMP' => \Drupal::time()->getRequestTime(),
       'PAID' => '12345',
       'METHOD' => 1,
     ];
@@ -158,7 +158,7 @@ class ReturnPageTest extends OrderBrowserTestBase {
     $entity_manager = $this->container->get('entity_type.manager');
     $entity_manager->getStorage('commerce_payment')->resetCache([1]);
     $payment = $entity_manager->getStorage('commerce_payment')->load(1);
-    $this->assertEquals('capture_completed', $payment->getState()->value);
+    $this->assertEquals('completed', $payment->getState()->value);
     $this->assertEquals($arguments2['PAID'], $payment->getRemoteId());
     $this->assertEquals('paid', $payment->getRemoteState());
   }