diff --git a/CHANGELOG.md b/CHANGELOG.md
index c28b7acc1..6a31a23a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ BUG FIXES:
   - core: Increase timeout for individual SSH connection to 60 seconds. [GH-2163]
   - core: Call realpath after creating directory so NFS directory creation
     works. [GH-2196]
+  - core: Don't try to be clever about deleting the machine state
+    directory anymore. Manually done in destroy actions. [GH-2201]
   - guests/linux: Try `id -g` in addition to `getent` for mounting
     VirtualBox shared folders [GH-2197]
   - hosts/arch: NFS exporting works properly, no exceptions. [GH-2161]
diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 287161365..69ab9d251 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -207,16 +207,6 @@ module Vagrant
       else
         # Delete the file, since the machine is now destroyed
         id_file.delete if id_file.file?
-
-        # Delete the entire data directory contents since all state
-        # associated with the VM is now gone.
-        @data_dir.children.each do |child|
-          begin
-            child.rmtree
-          rescue Errno::EACCES
-            @logger.info("EACCESS deleting file: #{child}")
-          end
-        end
       end
 
       # Store the ID locally