diff --git a/lib/chef/resource/machine.rb b/lib/chef/resource/machine.rb
index 3adbb237..c8797719 100644
--- a/lib/chef/resource/machine.rb
+++ b/lib/chef/resource/machine.rb
@@ -98,10 +98,9 @@ def file(remote_path, local = nil)
   end
 
   def add_machine_options(options)
-    @machine_options = Cheffish::MergedConfig.new(options, @machine_options)
+    @machine_options = Chef::Mixin::DeepMerge.hash_only_merge(options, @machine_options)
   end
 
-
   # This is here because provisioning users will probably want to do things like:
   # machine "foo"
   #   action :destroy