diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index 2eb99d0d4..997206ec4 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -1,64 +1,60 @@
 require 'puppet'
-require 'fileutils'
-require 'tempfile'
 
 Puppet::Reports.register_report(:store) do
   desc "Store the yaml report on disk.  Each host sends its report as a YAML dump
     and this just stores the file on disk, in the `reportdir` directory.
 
     These files collect quickly -- one every half hour -- so it is a good idea
     to perform some maintenance on them if you use this report (it's the only
     default report)."
 
   def process
     # We don't want any tracking back in the fs.  Unlikely, but there
     # you go.
     client = self.host.gsub("..",".")
 
     dir = File.join(Puppet[:reportdir], client)
 
     if ! FileTest.exists?(dir)
       FileUtils.mkdir_p(dir)
       FileUtils.chmod_R(0750, dir)
     end
 
     # Now store the report.
     now = Time.now.gmtime
     name = %w{year month day hour min}.collect do |method|
       # Make sure we're at least two digits everywhere
       "%02d" % now.send(method).to_s
     end.join("") + ".yaml"
 
-    filename = File.join(dir, name)
+    file = File.join(dir, name)
 
-    f = Tempfile.new(name, dir)
     begin
-      f.print to_yaml
-      f.chmod(0640)
-      f.close
-      FileUtils.mv(f.path, filename)
+      File.open(file, "w", 0640) do |f|
+        f.print to_yaml
+      end
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.warning "Could not write report for #{client} at #{file}: #{detail}"
     end
 
     # Only testing cares about the return value
     file
   end
 
   # removes all reports for a given host
   def self.destroy(host)
     client = host.gsub("..",".")
     dir = File.join(Puppet[:reportdir], client)
 
     if File.exists?(dir)
       Dir.entries(dir).each do |file|
         next if ['.','..'].include?(file)
         file = File.join(dir, file)
         File.unlink(file) if File.file?(file)
       end
       Dir.rmdir(dir)
     end
   end
 end