Index: openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql	20 Nov 2017 15:19:27 -0000	1.16
+++ openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql	14 Jun 2018 15:05:17 -0000	1.17
@@ -75,17 +75,6 @@
 </fullquery>
 
  
-<fullquery name="package_insert_default_comment.select_comments">      
-      <querytext>
-      
-	    select acs_object.name(:user_id) as author,
-	           sysdate as creation_date
-	      from dual
-	
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="package_object_attribute_list.attributes_select">      
       <querytext>
       
Index: openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql	20 Nov 2017 15:19:27 -0000	1.22
+++ openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql	14 Jun 2018 15:05:17 -0000	1.23
@@ -74,17 +74,6 @@
 </fullquery>
 
  
-<fullquery name="package_insert_default_comment.select_comments">      
-      <querytext>
-      
-	    select acs_object__name(:user_id) as author,
-	           current_timestamp as creation_date
-	      
-	
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="package_object_attribute_list.attributes_select">      
       <querytext>
 
Index: openacs-4/packages/acs-subsite/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.tcl,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/acs-subsite/tcl/package-procs.tcl	17 May 2018 14:17:35 -0000	1.37
+++ openacs-4/packages/acs-subsite/tcl/package-procs.tcl	14 Jun 2018 15:05:17 -0000	1.38
@@ -519,16 +519,10 @@
     @creation-date 12/29/2000
 
 } {
-    if { [ad_conn isconnected] } {
-        set user_id [ad_conn user_id]
-        db_1row select_comments {}
-    } else {
-        db_1row select_author_unknown {
-            select 'Unknown' as author,
-            sysdate as creation_date
-            from dual
-        }
-    }
+    set author [expr {[ad_conn isconnected] ?
+                      [acs_user::get_element -element name] : "Unknown"}]
+    set creation_date [db_string current_timestamp {
+        select current_timestamp from dual}]
     return "
   --/** THIS IS AN AUTO GENERATED PACKAGE. $author was the
   --    user who created it