diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index a3afbca..551d6e9 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -55,11 +55,19 @@
     <!-- Comments -->
 
     <class class=".comment.Comment">
-        <implements interface="plone.uuid.interfaces.IAttributeUUID" />
         <require interface=".interfaces.IComment" permission="zope2.View" />
         <require attributes="Title Creator getId getText" permission="zope2.View" />
     </class>
 
+ 
+	<!-- XXX: Excluding plone.uuid for Plone 3 is only a temporary 'fix'.
+         See the comment above -->
+    <configure zcml:condition="have plone-4">
+    <class class=".comment.Comment">
+        <implements interface="plone.uuid.interfaces.IAttributeUUID" />
+    </class>
+    </configure>
+
     <utility
         component=".comment.CommentFactory"
         name="plone.Comment"