diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py
index 8c88039..a8ffe95 100644
--- a/plone/app/discussion/browser/controlpanel.py
+++ b/plone/app/discussion/browser/controlpanel.py
@@ -16,10 +16,12 @@ from zope.component import getUtility
 from zope.component import queryUtility
 from zope.component.hooks import getSite
 
+# try/except was added because Configuration Changed Event was moved inside the
+# controlpanel file in the PR #2495 on Products.CMFPlone
 try:
     from Products.CMFPlone.interfaces.controlpanel import IConfigurationChangedEvent  # noqa: E501
 except ImportError:
-    from Products.CMFPlone.interfaces import IConfigurationChangedEvent  # noqa: E501
+    from Products.CMFPlone.interfaces import IConfigurationChangedEvent
 
 
 class DiscussionSettingsEditForm(controlpanel.RegistryEditForm):