diff --git a/patches.xen/2a22ee6c3ab1-xen-xenbus_dev_frontend-Fix-XS_TRANSACTION_END-handl.patch b/patches.xen/2a22ee6c3ab1-xen-xenbus_dev_frontend-Fix-XS_TRANSACTION_END-handl.patch
deleted file mode 100644
index da5b792..0000000
--- a/patches.xen/2a22ee6c3ab1-xen-xenbus_dev_frontend-Fix-XS_TRANSACTION_END-handl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2a22ee6c3ab1d761bc9c04f1e4117edd55b82f09 Mon Sep 17 00:00:00 2001
-From: Simon Gaiser <simon@invisiblethingslab.com>
-Date: Thu, 15 Mar 2018 03:43:20 +0100
-Subject: [PATCH 1/3] xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling
-
-Commit fd8aa9095a95 ("xen: optimize xenbus driver for multiple
-concurrent xenstore accesses") made a subtle change to the semantic of
-xenbus_dev_request_and_reply() and xenbus_transaction_end().
-
-Before on an error response to XS_TRANSACTION_END
-xenbus_dev_request_and_reply() would not decrement the active
-transaction counter. But xenbus_transaction_end() has always counted the
-transaction as finished regardless of the response.
-
-The new behavior is that xenbus_dev_request_and_reply() and
-xenbus_transaction_end() will always count the transaction as finished
-regardless the response code (handled in xs_request_exit()).
-
-But xenbus_dev_frontend tries to end a transaction on closing of the
-device if the XS_TRANSACTION_END failed before. Trying to close the
-transaction twice corrupts the reference count. So fix this by also
-considering a transaction closed if we have sent XS_TRANSACTION_END once
-regardless of the return code.
-
-Cc: <stable@vger.kernel.org> # 4.11
-Fixes: fd8aa9095a95 ("xen: optimize xenbus driver for multiple concurrent xenstore accesses")
-Signed-off-by: Simon Gaiser <simon@invisiblethingslab.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
-Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
----
- drivers/xen/xenbus/xenbus_dev_frontend.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
-index a493e99bed21..81a84b3c1c50 100644
---- a/drivers/xen/xenbus/xenbus_dev_frontend.c
-+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
-@@ -365,7 +365,7 @@ void xenbus_dev_queue_reply(struct xb_req_data *req)
- 			if (WARN_ON(rc))
- 				goto out;
- 		}
--	} else if (req->msg.type == XS_TRANSACTION_END) {
-+	} else if (req->type == XS_TRANSACTION_END) {
- 		trans = xenbus_get_transaction(u, req->msg.tx_id);
- 		if (WARN_ON(!trans))
- 			goto out;
--- 
-2.16.2
-
diff --git a/series.conf b/series.conf
index a52f19f..9c7b0c7 100644
--- a/series.conf
+++ b/series.conf
@@ -26,7 +26,6 @@ patches.xen/pci_op-cleanup.patch
 patches.xen/xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
 
 # Upstreamed fix for HVM suspend issue with >= 4.11
-patches.xen/2a22ee6c3ab1-xen-xenbus_dev_frontend-Fix-XS_TRANSACTION_END-handl.patch
 patches.xen/b93008d1ac65-xen-xenbus-Catch-closing-of-non-existent-transaction.patch
 patches.xen/8fe5ab411209-xen-xenbus_dev_frontend-Verify-body-of-XS_TRANSACTIO.patch
 
diff --git a/version b/version
index 469f283..348c8cf 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-4.16.2
+4.16.8