From a4d77003b335cb33abd677af7a9bdfc33f264bdd Mon Sep 17 00:00:00 2001
From: Syed Muhammad Dawoud Sheraz Ali
 <40599381+DawoudSheraz@users.noreply.github.com>
Date: Fri, 25 Aug 2023 21:42:30 +0500
Subject: [PATCH] Revert "feat: add skill_tagging plugin configs (#32932)"
 (#33102)

This reverts commit fc5e7926c137b07f0189132e9d573ac990cb054e.
---
 cms/envs/common.py | 11 -----------
 lms/envs/common.py | 18 ------------------
 2 files changed, 29 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 79155b07c894..e79961337197 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -528,17 +528,6 @@
     # .. toggle_creation_date: 2023-03-31
     # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/32015
     'DISABLE_ADVANCED_SETTINGS': False,
-
-    # .. toggle_name: FEATURES['ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS']
-    # .. toggle_implementation: DjangoSetting
-    # .. toggle_default: False
-    # .. toggle_description: Temporary configuration which enables sending xblock events over the event bus.
-    # .. toggle_use_cases: open_edx
-    # .. toggle_creation_date: 2023-02-21
-    # .. toggle_warning: For consistency in user experience, keep the value in sync with the setting of the same name
-    #   in the LMS and CMS.
-    # .. toggle_tickets: 'https://github.com/openedx/edx-platform/pull/31813'
-    'ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS': True,
 }
 
 # .. toggle_name: ENABLE_COPPA_COMPLIANCE
diff --git a/lms/envs/common.py b/lms/envs/common.py
index f4d4a33b9576..a2666d3d6701 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -68,11 +68,6 @@
 from openedx.core.release import doc_version
 from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin
 
-try:
-    from skill_tagging.skill_tagging_mixin import SkillTaggingMixin
-except ImportError:
-    SkillTaggingMixin = None
-
 ################################### FEATURES ###################################
 # .. setting_name: PLATFORM_NAME
 # .. setting_default: Your Platform Name Here
@@ -1034,17 +1029,6 @@
     # .. toggle_creation_date: 2022-06-06
     # .. toggle_tickets: 'https://github.com/edx/edx-platform/pull/29538'
     'DISABLE_ALLOWED_ENROLLMENT_IF_ENROLLMENT_CLOSED': False,
-
-    # .. toggle_name: FEATURES['ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS']
-    # .. toggle_implementation: DjangoSetting
-    # .. toggle_default: False
-    # .. toggle_description: Temporary configuration which enables sending xblock events over the event bus.
-    # .. toggle_use_cases: open_edx
-    # .. toggle_creation_date: 2023-02-21
-    # .. toggle_warning: For consistency in user experience, keep the value in sync with the setting of the same name
-    #   in the LMS and CMS.
-    # .. toggle_tickets: 'https://github.com/openedx/edx-platform/pull/31813'
-    'ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS': True,
 }
 
 # Specifies extra XBlock fields that should available when requested via the Course Blocks API
@@ -1611,8 +1595,6 @@ def _make_mako_template_dirs(settings):
 # This should be moved into an XBlock Runtime/Application object
 # once the responsibility of XBlock creation is moved out of modulestore - cpennington
 XBLOCK_MIXINS = (LmsBlockMixin, InheritanceMixin, XModuleMixin, EditInfoMixin)
-if SkillTaggingMixin:
-    XBLOCK_MIXINS += (SkillTaggingMixin,)
 XBLOCK_EXTRA_MIXINS = ()
 
 # .. setting_name: XBLOCK_FIELD_DATA_WRAPPERS