diff --git a/interfaces/seccomp/template.go b/interfaces/seccomp/template.go
index f9a0ed6c63e..179896228b9 100644
--- a/interfaces/seccomp/template.go
+++ b/interfaces/seccomp/template.go
@@ -209,14 +209,17 @@ mlockall
 mmap
 mmap2
 
+# FIXME: commented out because of:
+# https://forum.snapcraft.io/t/snapd-2-25-blocked-because-of-possible-revert-race-condition
+#
 # Allow mknod for regular files, pipes and sockets (and not block or char
 # devices)
-mknod - |S_IFREG -
-mknodat - - |S_IFREG -
-mknod - |S_IFIFO -
-mknodat - - |S_IFIFO -
-mknod - |S_IFSOCK -
-mknodat - - |S_IFSOCK -
+#mknod - |S_IFREG -
+#mknodat - - |S_IFREG -
+#mknod - |S_IFIFO -
+#mknodat - - |S_IFIFO -
+#mknod - |S_IFSOCK -
+#mknodat - - |S_IFSOCK -
 
 modify_ldt
 mprotect