diff --git a/nova/compute.sls b/nova/compute.sls
index 7839551..995bd6a 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -206,18 +206,6 @@
     - pkg: nova_compute_packages
   - onlyif: "virsh net-list | grep default"
 
-{%- if compute.hugepages is defined %}
-
-/etc/default/qemu-kvm:
-  file.managed:
-  - contents: KVM_HUGEPAGES=1
-  - require:
-    - pkg: nova_compute_packages
-  - require_in:
-    - service: {{ compute.libvirt_service }}
-
-{%- endif %}
-
 {{ compute.libvirt_service }}:
   service.running:
   - enable: true
diff --git a/nova/files/mitaka/qemu.conf.Debian b/nova/files/mitaka/qemu.conf.Debian
index f3a8997..e4c823d 100644
--- a/nova/files/mitaka/qemu.conf.Debian
+++ b/nova/files/mitaka/qemu.conf.Debian
@@ -340,6 +340,7 @@
 #hugetlbfs_mount = ["/run/hugepages/kvm", "/mnt/hugepages_1GB"]
 {%- if compute.hugepages is defined %}
 hugetlbfs_mount = [{%- for mount in compute.hugepages.mount_points %}"{{ mount.path }}"{% if not loop.last %}, {% endif %}{%- endfor %}]
+security_driver="none"
 {%- endif %}
 
 # Path to the setuid helper for creating tap devices.  This executable