diff --git a/lib/WebGUI/Content/Asset.pm b/lib/WebGUI/Content/Asset.pm
index 59163ab5b..5ab9937af 100644
--- a/lib/WebGUI/Content/Asset.pm
+++ b/lib/WebGUI/Content/Asset.pm
@@ -169,25 +169,8 @@ sub handler {
     if (my $perfLog = $errorHandler->performanceLogger) { #show performance indicators if required
         my $t = [Time::HiRes::gettimeofday()];
         $output = dispatch($session, getRequestedAssetUrl($session));
-        $t = Time::HiRes::tv_interval($t) ;
-        if ($output =~ /<\/title>/) {
-            $output =~ s/<\/title>/ : ${t} seconds<\/title>/i;
-        } 
-        else {
-            # Kludge.
-            my $mimeType = $http->getMimeType();
-            if ($mimeType eq 'text/css') {
-                $session->output->print("\n/* Page generated in $t seconds. */\n");
-            } 
-            elsif ($mimeType =~ m{text/html}) {
-                $session->output->print("\nPage generated in $t seconds.\n");
-            } 
-            else {
-                # Don't apply to content when we don't know how
-                # to modify it semi-safely.
-            }
-        }
-    } 
+        $perfLog->({ time => Time::HiRes::tv_interval($t), type => 'Page' });
+    }
     else {
         $output = dispatch($session, getRequestedAssetUrl($session));
     }