diff --git a/CHANGES.txt b/CHANGES.txt
index 4e40dd6..ad7a59a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0b5 (unreleased)
 ------------------
 
+* Make IDiscussionLayer inherit from Interface again. Remove IDefaultPloneLayer,
+  since Plone 4.0b1 and plone.theme 2.0b1 are out now.
+  [timo]
+
 * Clean up Javascript code.
   [timo]
 
diff --git a/plone/app/discussion/interfaces.py b/plone/app/discussion/interfaces.py
index 7fb061e..ffc4142 100644
--- a/plone/app/discussion/interfaces.py
+++ b/plone/app/discussion/interfaces.py
@@ -287,10 +287,6 @@ class ICommentingTool(Interface):
         """Perform a search over all indexed comments.
         """
 
-#class IDiscussionLayer(Interface):
-# XXX: This is only temporarily. IDefaultPloneLayer can be removed again as soon
-# as Plone 4.0b1 with plone.theme 2.0b1 is out. [davisagli]
-from plone.theme.interfaces import IDefaultPloneLayer
-class IDiscussionLayer(IDefaultPloneLayer):
+class IDiscussionLayer(Interface):
     """Request marker installed via browserlayer.xml.
     """