From a18d936d465b149c29232b3606dfb103d4491ebb Mon Sep 17 00:00:00 2001
From: Manjinder Singh <49171515+jinder1s@users.noreply.github.com>
Date: Fri, 14 Feb 2020 13:14:18 -0500
Subject: [PATCH] Revert "Adding new settings to correct places (#23051)"
 (#23112)

This reverts commit f08185443e804f99274a4037903d4cff27718257.
---
 lms/envs/common.py     | 5 -----
 lms/envs/production.py | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index e454a619bc..a1b054f09b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -130,11 +130,6 @@ FEATURES = {
     # Toggles OAuth2 authentication provider
     'ENABLE_OAUTH2_PROVIDER': False,
 
-    # Toggles auth class in discussions djangoapps
-    'DISCUSSION_USE_NEW_OAUTH2_CLASS': False,
-    # Toggles auth class in bookmarks djangoapps
-    'BOOKMARKS_USE_NEW_OAUTH2_CLASS': False,
-
     # Allows to enable an API endpoint to serve XBlock view, used for example by external applications.
     # See jquey-xblock: https://github.com/edx-solutions/jquery-xblock
     'ENABLE_XBLOCK_VIEW_ENDPOINT': False,
diff --git a/lms/envs/production.py b/lms/envs/production.py
index 9f43c48b44..e336c3bbc6 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -768,12 +768,6 @@ if FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
     OAUTH_ID_TOKEN_EXPIRATION = ENV_TOKENS.get('OAUTH_ID_TOKEN_EXPIRATION', OAUTH_ID_TOKEN_EXPIRATION)
     OAUTH_DELETE_EXPIRED = ENV_TOKENS.get('OAUTH_DELETE_EXPIRED', OAUTH_DELETE_EXPIRED)
 
-##### Changing Authentication Class ####
-# Toggles auth class in discussions djangoapps
-DISCUSSION_USE_NEW_OAUTH2_CLASS = ENV_TOKENS.get('DISCUSSION_USE_NEW_OAUTH2_CLASS', False)
-# Toggles auth class in bookmakrs djangoapps
-BOOKMARKS_USE_NEW_OAUTH2_CLASS = ENV_TOKENS.get('BOOKMARKS_USE_NEW_OAUTH2_CLASS', False)
-
 ##### GOOGLE ANALYTICS IDS #####
 GOOGLE_ANALYTICS_ACCOUNT = AUTH_TOKENS.get('GOOGLE_ANALYTICS_ACCOUNT')
 GOOGLE_ANALYTICS_TRACKING_ID = AUTH_TOKENS.get('GOOGLE_ANALYTICS_TRACKING_ID')