diff -Nru strace-5.11/debian/changelog strace-5.11/debian/changelog
--- strace-5.11/debian/changelog	2021-02-25 16:49:46.000000000 +0000
+++ strace-5.11/debian/changelog	2021-06-16 17:14:51.000000000 +0000
@@ -1,3 +1,10 @@
+strace (5.11-0ubuntu1+rbalint1) hirsute; urgency=medium
+
+  * Revert "Fix FTBFS on armhf due to running tests on arm64 kernel"
+    This reverts commit cf7c506b3a8a371bb8848e91c36d529d3c2a1a8b.
+
+ -- Balint Reczey <balint@balintreczey.hu>  Wed, 16 Jun 2021 19:14:51 +0200
+
 strace (5.11-0ubuntu1) hirsute; urgency=medium
 
   * New upstream version 5.11
diff -Nru strace-5.11/debian/patches/0001-tests-Omit-some-checks-for-msgctl-and-shmctl-where-a.patch strace-5.11/debian/patches/0001-tests-Omit-some-checks-for-msgctl-and-shmctl-where-a.patch
--- strace-5.11/debian/patches/0001-tests-Omit-some-checks-for-msgctl-and-shmctl-where-a.patch	2021-02-25 16:49:46.000000000 +0000
+++ strace-5.11/debian/patches/0001-tests-Omit-some-checks-for-msgctl-and-shmctl-where-a.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-From 04fdb0a90b9371eb354b6079fcd25bcea1aa5e11 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint.reczey@canonical.com>
-Date: Sat, 9 Jan 2021 08:35:28 +0100
-Subject: [PATCH] tests: Omit some checks for msgctl and shmctl where addresses
- are bogus
-
-The false failures occur with armhf binaries running on arm64 kernel.
-
-* tests/ipc_msg.c
-* tests/ipc_shm.c
----
- tests/ipc_msg.c | 2 ++
- tests/ipc_shm.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/tests/ipc_msg.c b/tests/ipc_msg.c
-index f5a596227..857b09276 100644
---- a/tests/ipc_msg.c
-+++ b/tests/ipc_msg.c
-@@ -151,8 +151,10 @@ print_msqid_ds(const char *const str_ipc_cmd,
- 	       const int rc)
- {
- 	if (rc < 0) {
-+#if TEST_MSGCTL_BOGUS_ADDR
- 		printf("msgctl\\(%d, (%s\\|)?%s, %p\\) = %s\n",
- 		       id, str_ipc_64, str_ipc_cmd, ds, sprintrc_grep(rc));
-+#endif
- 		return;
- 	}
- 
-diff --git a/tests/ipc_shm.c b/tests/ipc_shm.c
-index 99c292911..facf1fed6 100644
---- a/tests/ipc_shm.c
-+++ b/tests/ipc_shm.c
-@@ -121,8 +121,10 @@ print_shmid_ds(const char *const str_ipc_cmd,
- 	       const int rc)
- {
- 	if (rc < 0) {
-+#if TEST_SHMCTL_BOGUS_ADDR
- 		printf("shmctl\\(%d, (%s\\|)?%s, %p\\) = %s\n",
- 		       id, str_ipc_64, str_ipc_cmd, ds, sprintrc_grep(rc));
-+#endif
- 		return;
- 	}
- 	printf("shmctl\\(%d, (%s\\|)?%s, \\{shm_perm=\\{uid=%u, gid=%u"
--- 
-2.25.1
-
diff -Nru strace-5.11/debian/patches/series strace-5.11/debian/patches/series
--- strace-5.11/debian/patches/series	2021-02-25 16:49:46.000000000 +0000
+++ strace-5.11/debian/patches/series	2021-06-16 17:14:51.000000000 +0000
@@ -1,4 +1,3 @@
-0001-tests-Omit-some-checks-for-msgctl-and-shmctl-where-a.patch
 02-disable_delay_test
 ptrace-error-verbosity.patch
 kexec_file_load.patch