diff --git a/templates/dataset/edit_attributes.mako b/templates/dataset/edit_attributes.mako
index b63df5be33d..b0300181f6a 100644
--- a/templates/dataset/edit_attributes.mako
+++ b/templates/dataset/edit_attributes.mako
@@ -4,7 +4,7 @@
 <%def name="title()">${_('Edit Dataset Attributes')}</%def>
 
 <%def name="stylesheets()">
-    ${h.css( "base", "history", "autocomplete_tagging" )}
+    ${h.css( "base", "autocomplete_tagging" )}
 </%def>
 <% user, user_roles = trans.get_user_and_roles() %>
 
@@ -84,17 +84,17 @@
                 </div>
                 <div style="clear: both"></div>
             </div>
-            %if trans.get_user() is not None:
-            <div class="form-row">
-                <label>
-                    Tags:
-                </label>
-                <div id="dataset-tag-area" 
-		     style="float: left; margin-left: 1px; width: 295px; margin-right: 10px; border-style: inset; border-color: #ddd; border-width: 1px">
-                </div>
-                <div style="clear: both"></div>
-            </div>
-            %endif
+            ## %if trans.get_user() is not None:
+            ## <div class="form-row">
+            ##     <label>
+            ##         Tags:
+            ##     </label>
+            ##     <div id="dataset-tag-area" 
+            ##          style="float: left; margin-left: 1px; width: 295px; margin-right: 10px; border-style: inset; border-color: #ddd; border-width: 1px">
+            ##     </div>
+            ##     <div style="clear: both"></div>
+            ## </div>
+            ## %endif
             %for name, spec in data.metadata.spec.items():
                 %if spec.visible:
                     <div class="form-row">
diff --git a/templates/root/history.mako b/templates/root/history.mako
index 98c199b1ac8..d836f6c8c3c 100644
--- a/templates/root/history.mako
+++ b/templates/root/history.mako
@@ -377,8 +377,8 @@ var updater_callback = function ( tracked_datasets ) {
     <p></p>
 %endif
 
-<div id="history-tag-area" style="margin-bottom: 1em">
-</div>
+## <div id="history-tag-area" style="margin-bottom: 1em">
+## </div>
 
 <%namespace file="history_common.mako" import="render_dataset" />