diff --git a/docs/setup.md b/docs/setup.md
index 4a26f6ce..0a84b66f 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -229,6 +229,11 @@ CONFIG_KVM_AMD=m
 CONFIG_KVM_INTROSPECTION=y
 ~~~
 
+If you are running on Ubuntu:
+~~~
+CONFIG_TRANSPARENT_HUGEPAGE=n
+~~~
+
 Build and install the kernel
 ~~~
 $ make -j$(nproc)
diff --git a/vagrant/ansible/roles/kvm/tasks/main.yml b/vagrant/ansible/roles/kvm/tasks/main.yml
index f8487ddd..3a9f1e74 100644
--- a/vagrant/ansible/roles/kvm/tasks/main.yml
+++ b/vagrant/ansible/roles/kvm/tasks/main.yml
@@ -52,10 +52,7 @@
     - { switch: "--enable", option: "KVM_AMD" }
     # enable KVM_INTROSPECTION
     - { switch: "--enable", option: "KVM_INTROSPECTION" }
-    # enable REMOTE_MAPPING
-    # -> !TRANSPARENT_HUGEPAGE
     - { switch: "--disable", option: "TRANSPARENT_HUGEPAGE" }
-    - { switch: "--enable", option: "REMOTE_MAPPING" }
 
 - name: append -kvmi to kernel version string
   lineinfile: