diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index 1c5a8b9..57c23d5 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -11,18 +11,8 @@
 
     <include package="plone.indexer" />
     <include package="plone.app.registry" />
-	
-    <!-- XXX: Excluding plone.app.uuid for Plone 3 is only a temporary 'fix'.
-         plone.app.uuid causes the IObjectAddedEvent to be fired twice on
-         Plone 3. This causes the email notifications to be sent twice.
-
-         This means that https://dev.plone.org/plone/ticket/10652 is fixed only
-         for Plone 4.
-    -->
-    <configure zcml:condition="have plone-4">
-        <include package="plone.uuid" />
-        <include package="plone.app.uuid" />
-    </configure>
+    <include package="plone.uuid" />
+    <include package="plone.app.uuid" />
 
     <include file="permissions.zcml" />
     <include file="notifications.zcml" />
@@ -61,14 +51,9 @@
         <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"