2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers/benchmark_helper.rb b/actionpack/lib/action_view/helpers/benchmark_helper.rb
index bd72cda700..372d24a22e 100644
--- a/actionpack/lib/action_view/helpers/benchmark_helper.rb
+++ b/actionpack/lib/action_view/helpers/benchmark_helper.rb
@@ -22,12 +22,12 @@ module ActionView
       # (:debug, :info, :warn, :error); the default value is :info.
       def benchmark(message = "Benchmarking", level = :info)
         if controller.logger
-          seconds = Benchmark.realtime { yield }
-          controller.logger.send(level, "#{message} (#{'%.1f' % (seconds * 1000)}ms)")
+          ms = Benchmark.ms { yield }
+          controller.logger.send(level, '%s (%.1fms)' % [message, ms])
         else
           yield
         end
       end
     end
   end
-end
-\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 3b301248ff..af8c4d5e21 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -1,4 +1,4 @@
-require 'erb'
+require 'action_view/erb/util'
 require 'set'
 
 module ActionView