diff --git a/lib/vagrant/action.rb b/lib/vagrant/action.rb
index c0eaffcc8..432147691 100644
--- a/lib/vagrant/action.rb
+++ b/lib/vagrant/action.rb
@@ -12,6 +12,7 @@ module Vagrant
       autoload :BoxCheckOutdated, "vagrant/action/builtin/box_check_outdated"
       autoload :BoxRemove, "vagrant/action/builtin/box_remove"
       autoload :Call,    "vagrant/action/builtin/call"
+      autoload :CleanupDisks, "vagrant/action/builtin/cleanup_disks"
       autoload :Confirm, "vagrant/action/builtin/confirm"
       autoload :ConfigValidate, "vagrant/action/builtin/config_validate"
       autoload :DestroyConfirm, "vagrant/action/builtin/destroy_confirm"
diff --git a/plugins/providers/virtualbox/action.rb b/plugins/providers/virtualbox/action.rb
index edfbbcbe0..00bfe09db 100644
--- a/plugins/providers/virtualbox/action.rb
+++ b/plugins/providers/virtualbox/action.rb
@@ -79,6 +79,7 @@ module VagrantPlugins
           b.use ForwardPorts
           b.use SetHostname
           b.use SaneDefaults
+          b.use CleanupDisks
           b.use Disk
           b.use Customize, "pre-boot"
           b.use Boot
diff --git a/plugins/providers/virtualbox/cap/cleanup_disks.rb b/plugins/providers/virtualbox/cap/cleanup_disks.rb
new file mode 100644
index 000000000..498e193f5
--- /dev/null
+++ b/plugins/providers/virtualbox/cap/cleanup_disks.rb
@@ -0,0 +1,23 @@
+require "log4r"
+require "vagrant/util/numeric"
+require "vagrant/util/experimental"
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Cap
+      module CleanupDisks
+        LOGGER = Log4r::Logger.new("vagrant::plugins::virtualbox::cleanup_disks")
+
+        # @param [Vagrant::Machine] machine
+        # @param [VagrantPlugins::Kernel_V2::VagrantConfigDisk] defined_disks
+        def self.cleanup_disks(machine, defined_disks)
+          return if defined_disks.empty?
+
+          return if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
+        end
+
+        protected
+      end
+    end
+  end
+end