diff --git a/src/Api/Actions/DeleteAction.php b/src/Api/Actions/DeleteAction.php
index f460063c70..2d1863695f 100644
--- a/src/Api/Actions/DeleteAction.php
+++ b/src/Api/Actions/DeleteAction.php
@@ -13,7 +13,7 @@
 use Flarum\Api\Request;
 use Zend\Diactoros\Response\EmptyResponse;
 
-abstract class DeleteAction extends JsonApiAction
+abstract class DeleteAction implements Action
 {
     /**
      * Delegate deletion of the resource, and return a 204 No Content
@@ -22,7 +22,7 @@ abstract class DeleteAction extends JsonApiAction
      * @param \Flarum\Api\Request $request
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function respond(Request $request)
+    public function handle(Request $request)
     {
         $this->delete($request);
 
diff --git a/src/Api/Actions/Extensions/UpdateAction.php b/src/Api/Actions/Extensions/UpdateAction.php
index 3a44dea154..4f2e633b5f 100644
--- a/src/Api/Actions/Extensions/UpdateAction.php
+++ b/src/Api/Actions/Extensions/UpdateAction.php
@@ -10,13 +10,13 @@
 
 namespace Flarum\Api\Actions\Extensions;
 
-use Flarum\Api\Actions\JsonApiAction;
+use Flarum\Api\Actions\Action;
 use Flarum\Api\Request;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Flarum\Core\Exceptions\PermissionDeniedException;
 use Flarum\Support\ExtensionManager;
 
-class UpdateAction extends JsonApiAction
+class UpdateAction implements Action
 {
     protected $extensions;
 
@@ -25,7 +25,7 @@ public function __construct(ExtensionManager $extensions)
         $this->extensions = $extensions;
     }
 
-    protected function respond(Request $request)
+    public function handle(Request $request)
     {
         if (! $request->actor->isAdmin()) {
             throw new PermissionDeniedException;
diff --git a/src/Api/Actions/ForgotAction.php b/src/Api/Actions/ForgotAction.php
index 95e56f49b1..fa49182483 100644
--- a/src/Api/Actions/ForgotAction.php
+++ b/src/Api/Actions/ForgotAction.php
@@ -16,7 +16,7 @@
 use Illuminate\Contracts\Bus\Dispatcher;
 use Zend\Diactoros\Response\EmptyResponse;
 
-class ForgotAction extends JsonApiAction
+class ForgotAction implements Action
 {
     protected $users;
 
@@ -34,7 +34,7 @@ public function __construct(UserRepository $users, Dispatcher $bus)
      * @param \Flarum\Api\Request $request
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function respond(Request $request)
+    public function handle(Request $request)
     {
         $email = $request->get('email');
 
diff --git a/src/Api/Actions/JsonApiAction.php b/src/Api/Actions/JsonApiAction.php
deleted file mode 100644
index 9cbe99dd01..0000000000
--- a/src/Api/Actions/JsonApiAction.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Flarum\Api\Actions;
-
-use Flarum\Api\Request;
-use Zend\Diactoros\Response\JsonResponse;
-
-abstract class JsonApiAction implements Action
-{
-    /**
-     * Handle an API request and return an API response, handling any relevant
-     * (API-related) exceptions that are thrown.
-     *
-     * @param Request $request
-     * @return \Psr\Http\Message\ResponseInterface
-     */
-    public function handle(Request $request)
-    {
-        return $this->respond($request);
-    }
-
-    /**
-     * Handle an API request and return an API response.
-     *
-     * @param Request $request
-     * @return \Psr\Http\Message\ResponseInterface
-     */
-    abstract protected function respond(Request $request);
-}
diff --git a/src/Api/Actions/SerializeAction.php b/src/Api/Actions/SerializeAction.php
index b60b98c45b..16398282b0 100644
--- a/src/Api/Actions/SerializeAction.php
+++ b/src/Api/Actions/SerializeAction.php
@@ -19,7 +19,7 @@
 use Tobscure\JsonApi\SerializerInterface;
 use Zend\Diactoros\Response\JsonResponse;
 
-abstract class SerializeAction extends JsonApiAction
+abstract class SerializeAction implements Action
 {
     /**
      * The name of the serializer class to output results with.
@@ -77,7 +77,7 @@ abstract class SerializeAction extends JsonApiAction
      * @param Request $request
      * @return JsonResponse
      */
-    public function respond(Request $request)
+    public function handle(Request $request)
     {
         $request = $this->buildJsonApiRequest($request);
         $document = new Document();
diff --git a/src/Api/Actions/TokenAction.php b/src/Api/Actions/TokenAction.php
index 4dfeff8692..5d4da1ec63 100644
--- a/src/Api/Actions/TokenAction.php
+++ b/src/Api/Actions/TokenAction.php
@@ -18,7 +18,7 @@
 use Illuminate\Contracts\Bus\Dispatcher;
 use Zend\Diactoros\Response\JsonResponse;
 
-class TokenAction extends JsonApiAction
+class TokenAction implements Action
 {
     protected $users;
 
@@ -37,7 +37,7 @@ public function __construct(UserRepository $users, Dispatcher $bus)
      * @return \Psr\Http\Message\ResponseInterface
      * @throws PermissionDeniedException
      */
-    public function respond(Request $request)
+    public function handle(Request $request)
     {
         $identification = $request->get('identification');
         $password = $request->get('password');
diff --git a/src/Api/Client.php b/src/Api/Client.php
index 197e5e46a1..ccaec307e1 100644
--- a/src/Api/Client.php
+++ b/src/Api/Client.php
@@ -38,7 +38,7 @@ public function __construct(Container $container)
      */
     public function send(User $actor, $actionClass, array $input = [])
     {
-        /** @var \Flarum\Api\Actions\JsonApiAction $action */
+        /** @var \Flarum\Api\Actions\Action $action */
         $action = $this->container->make($actionClass);
 
         $response = $action->handle(new Request($input, $actor));