diff --git a/cms/djangoapps/contentstore/config/waffle.py b/cms/djangoapps/contentstore/config/waffle.py
index d5707c9eae..0e5de8b0e0 100644
--- a/cms/djangoapps/contentstore/config/waffle.py
+++ b/cms/djangoapps/contentstore/config/waffle.py
@@ -27,12 +27,6 @@ def waffle_flags():
 
 
 # Flags
-ENABLE_IN_CONTEXT_IMAGE_SELECTION = CourseWaffleFlag(
-    waffle_namespace=waffle_flags(),
-    flag_name=u'enable_in_context_image_selection',
-    flag_undefined_default=False
-)
-
 ENABLE_CHECKLISTS_QUALITY = CourseWaffleFlag(
     waffle_namespace=waffle_flags(),
     flag_name=u'enable_checklists_quality',
diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py
index 06798d8cdb..490e7a0efb 100644
--- a/cms/djangoapps/contentstore/features/html-editor.py
+++ b/cms/djangoapps/contentstore/features/html-editor.py
@@ -58,22 +58,6 @@ def i_click_on_edit_icon(_step):
     world.edit_component()
 
 
-@step('I add an image with static link "(.*)" via the Image Plugin Icon$')
-def i_click_on_image_plugin_icon(_step, path):
-    use_plugin(
-        '.mce-i-image',
-        lambda: world.css_fill('.mce-textbox', path, 0)
-    )
-
-
-@step('the link is shown as "(.*)" in the Image Plugin$')
-def check_link_in_image_plugin(_step, path):
-    use_plugin(
-        '.mce-i-image',
-        lambda: assert_equal(path, world.css_find('.mce-textbox')[0].value)
-    )
-
-
 @step('I add a link with static link "(.*)" via the Link Plugin Icon$')
 def i_click_on_link_plugin_icon(_step, path):
     def fill_in_link_fields():
diff --git a/cms/templates/container.html b/cms/templates/container.html
index b2ecac3616..f180c92537 100644
--- a/cms/templates/container.html
+++ b/cms/templates/container.html
@@ -11,7 +11,6 @@ else:
 <%!
 from django.utils.translation import ugettext as _
 
-from cms.djangoapps.contentstore.config.waffle import ENABLE_IN_CONTEXT_IMAGE_SELECTION
 from contentstore.views.helpers import xblock_studio_url, xblock_type_display_name
 from openedx.core.djangolib.js_utils import (
     dump_js_escaped_json, js_escaped_string
@@ -34,11 +33,9 @@ from openedx.core.djangolib.markup import HTML, Text
     <%static:include path="common/templates/image-modal.underscore" />
 </script>
 <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
-% if ENABLE_IN_CONTEXT_IMAGE_SELECTION.is_enabled(xblock_locator.course_key):
-    % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-        <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
-        <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
-    % endif
+% if not settings.STUDIO_FRONTEND_CONTAINER_URL:
+    <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
+    <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
 % endif
 </%block>
 
@@ -59,11 +56,9 @@ from openedx.core.djangolib.markup import HTML, Text
 
 <%block name="content">
 
-% if ENABLE_IN_CONTEXT_IMAGE_SELECTION.is_enabled(xblock_locator.course_key):
-  <script type="text/javascript">
+<script type="text/javascript">
     window.STUDIO_FRONTEND_IN_CONTEXT_IMAGE_SELECTION = true;
-  </script>
-% endif
+</script>
 
 
 <div class="wrapper-mast wrapper">
@@ -172,27 +167,25 @@ from openedx.core.djangolib.markup import HTML, Text
                 % endif
             </aside>
         </section>
-        % if ENABLE_IN_CONTEXT_IMAGE_SELECTION.is_enabled(xblock_locator.course_key):
-          <div id="edit-image-modal">
-            <%static:studiofrontend entry="editImageModal">
-              {
-                "course": {
-                    "id": "${context_course.id | n, js_escaped_string}",
-                    "name": "${context_course.display_name_with_default | n, js_escaped_string}",
-                    "url_name": "${context_course.location.name | n, js_escaped_string}",
-                    "org": "${context_course.location.org | n, js_escaped_string}",
-                    "num": "${context_course.location.course | n, js_escaped_string}",
-                    "display_course_number": "${context_course.display_coursenumber | n, js_escaped_string}",
-                    "revision": "${context_course.location.revision | n, js_escaped_string}"
-                },
-                "help_tokens": {
-                    "image_accessibility": "${get_online_help_info('image_accessibility')['doc_url'] | n, js_escaped_string}"
-                },
-                "lang": "${language_code | n, js_escaped_string}"
-              }
-            </%static:studiofrontend>
-          </div>
-        % endif
+        <div id="edit-image-modal">
+        <%static:studiofrontend entry="editImageModal">
+            {
+            "course": {
+                "id": "${context_course.id | n, js_escaped_string}",
+                "name": "${context_course.display_name_with_default | n, js_escaped_string}",
+                "url_name": "${context_course.location.name | n, js_escaped_string}",
+                "org": "${context_course.location.org | n, js_escaped_string}",
+                "num": "${context_course.location.course | n, js_escaped_string}",
+                "display_course_number": "${context_course.display_coursenumber | n, js_escaped_string}",
+                "revision": "${context_course.location.revision | n, js_escaped_string}"
+            },
+            "help_tokens": {
+                "image_accessibility": "${get_online_help_info('image_accessibility')['doc_url'] | n, js_escaped_string}"
+            },
+            "lang": "${language_code | n, js_escaped_string}"
+            }
+        </%static:studiofrontend>
+        </div>
     </div>
 </div>
 </%block>