Merge pull request #15070 from edx/robrap/revert-waffle-hack

Revert: Default unified_course_view on in devstack.

lms/envs/devstack.py

@@ -261,18 +261,6 @@ JWT_AUTH.update({
     'JWT_AUDIENCE': 'lms-key',
 })
 
-# TODO: TNL-6546: Remove this waffle and flag code.
-from django.db.utils import ProgrammingError
-from waffle.models import Flag
-try:
-    flag, created = Flag.objects.get_or_create(name='unified_course_view')
-    flag.everyone = True
-    flag.save()
-    WAFFLE_OVERRIDE = True
-except ProgrammingError:
-    # during initial reset_db, the table for the flag doesn't yet exist.
-    pass
-
 #####################################################################
 # See if the developer has any local overrides.
 if os.path.isfile(join(dirname(abspath(__file__)), 'private.py')):