@@ -248,25 +248,14 @@ func (s *containerRouter) postContainersStop(ctx context.Context, w http.Respons

 	return nil

 }

-func (s *containerRouter) postContainersKill(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func (s *containerRouter) postContainersKill(_ context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := httputils.ParseForm(r); err != nil {

 		return err

 	}

 	name := vars["name"]

 	if err := s.backend.ContainerKill(name, r.Form.Get("signal")); err != nil {

-		var isStopped bool

-		if errdefs.IsConflict(err) {

-			isStopped = true

-		}

-

-		// Return error that's not caused because the container is stopped.

-		// Return error if the container is not running and the api is >= 1.20

-		// to keep backwards compatibility.

-		version := httputils.VersionFromContext(ctx)

-		if versions.GreaterThanOrEqualTo(version, "1.20") || !isStopped {

-			return errors.Wrapf(err, "Cannot kill container: %s", name)

-		}

+		return errors.Wrapf(err, "cannot kill container: %s", name)

 	}

 	w.WriteHeader(http.StatusNoContent)

@@ -6,7 +6,6 @@ import (

 	"time"

 	containertypes "github.com/docker/docker/api/types/container"

-	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration/internal/container"

 	"github.com/docker/docker/testutil"

 	"github.com/docker/docker/testutil/request"

@@ -133,15 +132,6 @@ func TestKillStoppedContainer(t *testing.T) {

 	assert.Assert(t, is.Contains(err.Error(), "is not running"))

 }

-func TestKillStoppedContainerAPIPre120(t *testing.T) {

-	skip.If(t, testEnv.DaemonInfo.OSType == "windows", "Windows only supports 1.25 or later")

-	ctx := setupTest(t)

-	apiClient := request.NewAPIClient(t, client.WithVersion("1.19"))

-	id := container.Create(ctx, t, apiClient)

-	err := apiClient.ContainerKill(ctx, id, "SIGKILL")

-	assert.NilError(t, err)

-}

-

 func TestKillDifferentUserContainer(t *testing.T) {

 	// TODO Windows: Windows does not yet support -u (Feb 2016).

 	skip.If(t, testEnv.DaemonInfo.OSType == "windows", "User containers (container.Config.User) are not yet supported on %q platform", testEnv.DaemonInfo.OSType)