diff --git a/etc/modprobe.d/30_nf_conntrack_helper_disable.conf b/etc/modprobe.d/30_nf_conntrack_helper_disable.conf
new file mode 100644
index 0000000..bd42a28
--- /dev/null
+++ b/etc/modprobe.d/30_nf_conntrack_helper_disable.conf
@@ -0,0 +1,2 @@
+## https://phabricator.whonix.org/T486
+options nf_conntrack nf_conntrack_helper=0
diff --git a/etc/sysctl.d/nf_conntrack_helper.conf b/etc/sysctl.d/nf_conntrack_helper.conf
deleted file mode 100644
index 69b751d..0000000
--- a/etc/sysctl.d/nf_conntrack_helper.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-## TODO
-## Disable conntrack helper?
-## https://phabricator.whonix.org/T486
-#net.netfilter.nf_conntrack_helper=0