diff --git a/assets/rich_text_components_definitions.ts b/assets/rich_text_components_definitions.ts
index f7585e7c7dae9..b8ead7a0102ab 100644
--- a/assets/rich_text_components_definitions.ts
+++ b/assets/rich_text_components_definitions.ts
@@ -35,7 +35,6 @@ export default {
       "schema": {
         "type": "unicode"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": "Sample Header"
     }, {
       "name": "content",
@@ -46,7 +45,6 @@ export default {
           "hide_complex_extensions": true
         }
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": "You have opened the collapsible block."
     }]
   },
@@ -68,7 +66,6 @@ export default {
         "type": "custom",
         "obj_type": "Filepath"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": ""
     }, {
       "name": "caption",
@@ -80,7 +77,6 @@ export default {
           "max_value": 500
         }]
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": ""
     }, {
       "name": "alt",
@@ -96,7 +92,6 @@ export default {
           "rows": 3
         }
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": ""
     }]
   },
@@ -118,7 +113,6 @@ export default {
         "type": "custom",
         "obj_type": "SanitizedUrl"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": ""
     }, {
       "name": "text",
@@ -126,7 +120,6 @@ export default {
       "schema": {
         "type": "unicode"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": ""
     }]
   },
@@ -148,7 +141,6 @@ export default {
         "type": "custom",
         "obj_type": "MathExpressionContent"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": {
         "raw_latex": "",
         "svg_filename": ""
@@ -175,7 +167,6 @@ export default {
           "id": "is_nonempty"
         }]
       },
-      "default_value_obtainable_from_highlight": true,
       "default_value": "concept card"
     }, {
       "name": "skill_id",
@@ -184,7 +175,6 @@ export default {
         "type": "custom",
         "obj_type": "SkillSelector"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": ""
     }]
   },
@@ -206,7 +196,6 @@ export default {
         "type": "custom",
         "obj_type": "ListOfTabs"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": [{
         "title": "Hint introduction",
         "content": "This set of tabs shows some hints. Click on the other tabs to display the relevant hints."
@@ -233,7 +222,6 @@ export default {
       "schema": {
         "type": "unicode"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": ""
     }, {
       "name": "start",
@@ -245,7 +233,6 @@ export default {
           "min_value": 0
         }]
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": 0
     }, {
       "name": "end",
@@ -257,7 +244,6 @@ export default {
             "min_value": 0
           }]
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": 0
     }, {
       "name": "autoplay",
@@ -265,7 +251,6 @@ export default {
       "schema": {
         "type": "bool"
       },
-      "default_value_obtainable_from_highlight": false,
       "default_value": false
     }]
   }
diff --git a/core/domain/rte_component_registry.py b/core/domain/rte_component_registry.py
index 7c6e10284bb0e..2f728da3b7562 100644
--- a/core/domain/rte_component_registry.py
+++ b/core/domain/rte_component_registry.py
@@ -43,7 +43,6 @@ class CustomizationArgSpecDict(TypedDict):
     # Here we use type Any because values in schema dictionary can be of
     # type str, List, Dict and other types too.
     schema: Dict[str, Any]
-    default_value_obtainable_from_highlight: bool
     default_value: Union[str, int, List[str], Dict[str, str]]
 
 
diff --git a/core/domain/rte_component_registry_test.py b/core/domain/rte_component_registry_test.py
index 1e7955505b576..6ffd0bb600f2a 100644
--- a/core/domain/rte_component_registry_test.py
+++ b/core/domain/rte_component_registry_test.py
@@ -76,8 +76,7 @@ def _validate_customization_arg_specs(
         """Validates the given customization arg specs."""
         for ca_spec in customization_arg_specs:
             self.assertEqual(set(ca_spec.keys()), set([
-                'name', 'description', 'schema', 'default_value',
-                'default_value_obtainable_from_highlight']))
+                'name', 'description', 'schema', 'default_value']))
 
             self.assertTrue(
                 isinstance(ca_spec['name'], str))
diff --git a/core/templates/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts b/core/templates/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts
index 9663af6c99086..eebeb1f0113d0 100644
--- a/core/templates/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts
+++ b/core/templates/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts
@@ -25,7 +25,6 @@ export interface RteComponentSpecs {
   backendId: string;
   customizationArgSpecs: {
     name: string; value: string; 'default_value': string;
-    'default_value_obtainable_from_highlight': boolean;
   }[];
   id: string;
   iconDataUrl: string;
@@ -40,8 +39,8 @@ export interface RteHelperService {
   getRichTextComponents: () => RteComponentSpecs[];
   isInlineComponent: (string) => boolean;
   openCustomizationModal: (
-    componentIsNewlyCreated, customizationArgSpecs, attrsCustomizationArgsDict,
-    onSubmitCallback, onDismissCallback
+    customizationArgSpecs, attrsCustomizationArgsDict, onSubmitCallback,
+    onDismissCallback
   ) => void;
 }
 
@@ -108,13 +107,11 @@ export class CkEditorInitializerService {
                 var that = this;
                 var customizationArgs = {};
                 customizationArgSpecs.forEach(function(spec) {
-                  customizationArgs[spec.name] = that.data[spec.name];
+                  customizationArgs[spec.name] = that.data[spec.name] ||
+                    spec.default_value;
                 });
 
-                const componentIsNewlyCreated: boolean = !that.isReady();
-
                 rteHelperService.openCustomizationModal(
-                  componentIsNewlyCreated,
                   customizationArgSpecs,
                   customizationArgs,
                   function(customizationArgsDict) {
@@ -130,7 +127,7 @@ export class CkEditorInitializerService {
                     * has already been inserted into the RTE, we do not
                     * need to finalizeCreation again).
                     */
-                    if (componentIsNewlyCreated) {
+                    if (!that.isReady()) {
                       // Actually create the widget, if we have not already.
                       editor.widgets.finalizeCreation(container);
                     }
@@ -154,38 +151,16 @@ export class CkEditorInitializerService {
                   },
                   function(widgetShouldBeRemoved) {
                     if (widgetShouldBeRemoved || that.data.isCopied) {
-                      const defaultValueObtainableFromHighlight = (
-                        customizationArgSpecs
-                          .some(function(spec) {
-                            return spec.default_value_obtainable_from_highlight;
-                          }));
-
                       that.data.isCopied = false;
                       var newWidgetSelector = (
                         '[data-cke-widget-id="' + that.id + '"]');
-                      if (newWidgetSelector === null) {
-                        return;
-                      }
-                      var widgetElement = editor.editable().findOne(
-                        newWidgetSelector);
-
-                      if (!widgetElement) {
-                        return;
-                      }
-
-                      /**
-                       * If the component's default value was not obtained from
-                       * a highlighted text or was not newly created, then
-                       * simply remove the component. Otherwise, load the
-                       * initial snapshot to revert back to the original text.
-                      */
-                      if (!defaultValueObtainableFromHighlight ||
-                          !componentIsNewlyCreated) {
-                        widgetElement.remove();
-                        editor.fire('change');
-                      } else {
-                        editor.loadSnapshot(that.initialSnapshot);
-                        editor.fire('change');
+                      if (newWidgetSelector !== null) {
+                        var widgetElement = editor.editable().findOne(
+                          newWidgetSelector);
+                        if (widgetElement) {
+                          widgetElement.remove();
+                          editor.fire('change');
+                        }
                       }
                     }
                   });
@@ -227,23 +202,6 @@ export class CkEditorInitializerService {
                     // eslint-disable-next-line max-len
                     index ? item.charAt(0).toUpperCase() + item.slice(1).toLowerCase() : item.toLowerCase()
                   );
-
-                  /**
-                   * If the component has not been initialized before with data,
-                   * then set the default value or highlighted value as the
-                   * component's data.
-                   */
-                  const selection = that.editor.getSelection()
-                    .getSelectedText();
-                  if (!that.data[spec.name]) {
-                    if (spec.default_value_obtainable_from_highlight &&
-                        selection) {
-                      that.setData(spec.name, selection);
-                    } else {
-                      that.setData(spec.name, spec.default_value);
-                    }
-                  }
-
                   capital.join('');
                   const customEl = that.element.getChild(0).$;
                   customEl[capital.join('') + 'WithValue'] = (
@@ -262,7 +220,6 @@ export class CkEditorInitializerService {
                   dontUpdate: true
                 });
                 var that = this;
-                that.initialSnapshot = editor.getSnapshot();
                 // On init, read values from component attributes and save them.
                 customizationArgSpecs.forEach(function(spec) {
                   var value = that.element.getChild(0).getAttribute(
diff --git a/core/templates/services/rte-helper-modal.component.html b/core/templates/services/rte-helper-modal.component.html
index 022b08247e55b..db55f6f8a54a8 100644
--- a/core/templates/services/rte-helper-modal.component.html
+++ b/core/templates/services/rte-helper-modal.component.html
@@ -26,7 +26,7 @@ <h3>Customize This Component</h3>
   <div class="modal-footer">
     <button type="button"
             class="btn btn-danger e2e-test-delete-button"
-            *ngIf="!componentIsNewlyCreated"
+            *ngIf="!defaultRTEComponent"
             (click)="delete()">
             Delete
     </button>
diff --git a/core/templates/services/rte-helper-modal.controller.ts b/core/templates/services/rte-helper-modal.controller.ts
index 529ffa980aefd..029aea9e1a020 100644
--- a/core/templates/services/rte-helper-modal.controller.ts
+++ b/core/templates/services/rte-helper-modal.controller.ts
@@ -106,12 +106,12 @@ type CustomizationArgsNameAndValueArray = {
 export class RteHelperModalComponent {
   @Input() customizationArgSpecs: CustomizationArgsSpecsType;
   @Input() attrsCustomizationArgsDict: CustomizationArgsForRteType;
-  @Input() componentIsNewlyCreated: boolean;
   modalIsLoading: boolean = true;
   currentRteIsMathExpressionEditor: boolean = false;
   currentRteIsLinkEditor: boolean = false;
   tmpCustomizationArgs: CustomizationArgsNameAndValueArray = [];
   @ViewChild('schemaForm') schemaForm!: NgForm;
+  defaultRTEComponent: boolean;
   public customizationArgsForm: FormGroup;
 
   constructor(
@@ -198,6 +198,21 @@ export class RteHelperModalComponent {
       this.currentRteIsLinkEditor = true;
     }
 
+    // The 'defaultRTEComponent' variable controls whether the delete button
+    // needs to be shown. If the RTE component has default values, there is no
+    // need for a delete button as the 'Cancel' button would have
+    // the same functionality.
+    this.defaultRTEComponent = true;
+    for (let i = 0; i < this.customizationArgSpecs.length; i++) {
+      let caName = this.customizationArgSpecs[i].name;
+      let attrsCaDict = this.attrsCustomizationArgsDict;
+      if (
+        attrsCaDict.hasOwnProperty(caName) &&
+        attrsCaDict[caName] !== this.customizationArgSpecs[i].default_value
+      ) {
+        this.defaultRTEComponent = false;
+      }
+    }
     const formGroupControls = {};
     this.customizationArgSpecs.forEach((_, index) => {
       formGroupControls[index] = this.fb.control(
@@ -213,11 +228,23 @@ export class RteHelperModalComponent {
   }
 
   cancel(): void {
-    if (this.componentIsNewlyCreated) {
-      this.ngbActiveModal.dismiss(true);
-    } else {
-      this.ngbActiveModal.dismiss(false);
+    for (let i = 0; i < this.customizationArgSpecs.length; i++) {
+      let caName = this.customizationArgSpecs[i].name;
+      let attrsCaDict = this.attrsCustomizationArgsDict;
+      // If the RTE component contains only default ca values, we remove it
+      // from the editor on clicking cancel. When the
+      // uibModalInstance.dismiss method is called with true, the tag from
+      // the editor is removed and when called with false, the tag remains
+      // as-is.
+      if (
+        attrsCaDict.hasOwnProperty(caName) &&
+        attrsCaDict[caName] !== this.customizationArgSpecs[i].default_value
+      ) {
+        this.ngbActiveModal.dismiss(false);
+        return;
+      }
     }
+    this.ngbActiveModal.dismiss(true);
   }
 
   delete(): void {
diff --git a/core/templates/services/rte-helper.service.spec.ts b/core/templates/services/rte-helper.service.spec.ts
index 402e0d1e9b2f9..de43052e9506d 100644
--- a/core/templates/services/rte-helper.service.spec.ts
+++ b/core/templates/services/rte-helper.service.spec.ts
@@ -38,7 +38,6 @@ describe('Rte Helper Service', () => {
         schema: {
           type: 'unicode'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: 'Sample Header'
       }, {
         name: 'content',
@@ -49,7 +48,6 @@ describe('Rte Helper Service', () => {
             hide_complex_extensions: true
           }
         },
-        default_value_obtainable_from_highlight: false,
         default_value: 'You have opened the collapsible block.'
       }],
       id: 'collapsible',
@@ -68,7 +66,6 @@ describe('Rte Helper Service', () => {
           type: 'custom',
           obj_type: 'Filepath'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: ''
       }, {
         name: 'caption',
@@ -80,7 +77,6 @@ describe('Rte Helper Service', () => {
             max_value: 500
           }]
         },
-        default_value_obtainable_from_highlight: false,
         default_value: ''
       }, {
         name: 'alt',
@@ -98,7 +94,6 @@ describe('Rte Helper Service', () => {
             rows: 3
           }
         },
-        default_value_obtainable_from_highlight: false,
         default_value: ''
       }],
       id: 'image',
@@ -118,7 +113,6 @@ describe('Rte Helper Service', () => {
           type: 'custom',
           obj_type: 'SanitizedUrl'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: ''
       }, {
         name: 'text',
@@ -126,7 +120,6 @@ describe('Rte Helper Service', () => {
         schema: {
           type: 'unicode'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: ''
       }],
       id: 'link',
@@ -145,7 +138,6 @@ describe('Rte Helper Service', () => {
           type: 'custom',
           obj_type: 'MathExpressionContent'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: {
           raw_latex: '',
           svg_filename: ''
@@ -169,7 +161,6 @@ describe('Rte Helper Service', () => {
             id: 'is_nonempty'
           }]
         },
-        default_value_obtainable_from_highlight: true,
         default_value: 'concept card'
       }, {
         name: 'skill_id',
@@ -178,7 +169,6 @@ describe('Rte Helper Service', () => {
           type: 'custom',
           obj_type: 'SkillSelector'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: ''
       }],
       id: 'skillreview',
@@ -197,7 +187,6 @@ describe('Rte Helper Service', () => {
           type: 'custom',
           obj_type: 'ListOfTabs'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: [{
           title: 'Hint introduction',
           content: 'This set of tabs shows some hints. Click on the other' +
@@ -225,7 +214,6 @@ describe('Rte Helper Service', () => {
         schema: {
           type: 'unicode'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: ''
       }, {
         name: 'start',
@@ -238,7 +226,6 @@ describe('Rte Helper Service', () => {
             min_value: 0
           }]
         },
-        default_value_obtainable_from_highlight: false,
         default_value: 0
       }, {
         name: 'end',
@@ -251,7 +238,6 @@ describe('Rte Helper Service', () => {
             min_value: 0
           }]
         },
-        default_value_obtainable_from_highlight: false,
         default_value: 0
       }, {
         name: 'autoplay',
@@ -259,7 +245,6 @@ describe('Rte Helper Service', () => {
         schema: {
           type: 'bool'
         },
-        default_value_obtainable_from_highlight: false,
         default_value: false
       }],
       id: 'video',
@@ -292,7 +277,7 @@ describe('Rte Helper Service', () => {
     var submitCallBackSpy = jasmine.createSpy('submit');
     var dismissCallBackSpy = jasmine.createSpy('dismiss');
     rteHelperService.openCustomizationModal(
-      false, [], {}, submitCallBackSpy, dismissCallBackSpy);
+      [], {}, submitCallBackSpy, dismissCallBackSpy);
 
     expect(ngbModalSpy).toHaveBeenCalled();
   });
@@ -305,7 +290,7 @@ describe('Rte Helper Service', () => {
     var submitCallBackSpy = jasmine.createSpy('submit');
     var dismissCallBackSpy = jasmine.createSpy('dismiss');
     rteHelperService.openCustomizationModal(
-      false, [], {}, submitCallBackSpy, dismissCallBackSpy);
+      [], {}, submitCallBackSpy, dismissCallBackSpy);
     tick();
 
     expect(submitCallBackSpy).toHaveBeenCalled();
@@ -319,7 +304,7 @@ describe('Rte Helper Service', () => {
     var submitCallBackSpy = jasmine.createSpy('submit');
     var dismissCallBackSpy = jasmine.createSpy('dismiss');
     rteHelperService.openCustomizationModal(
-      false, [], {}, submitCallBackSpy, dismissCallBackSpy);
+      [], {}, submitCallBackSpy, dismissCallBackSpy);
     tick();
 
     expect(dismissCallBackSpy).toHaveBeenCalled();
diff --git a/core/templates/services/rte-helper.service.ts b/core/templates/services/rte-helper.service.ts
index 5ddb9e9bfd5ba..91efa1a94080d 100644
--- a/core/templates/services/rte-helper.service.ts
+++ b/core/templates/services/rte-helper.service.ts
@@ -59,7 +59,6 @@ export class RteHelperService {
   // after exiting the modal, and moves the cursor back to where it was
   // before the modal was opened.
   openCustomizationModal(
-      componentIsNewlyCreated: boolean,
       customizationArgSpecs: CustomizationArgsSpecsType,
       attrsCustomizationArgsDict: CustomizationArgsForRteType,
       onSubmitCallback?: (arg0: unknown) => void,
@@ -69,8 +68,6 @@ export class RteHelperService {
     const modalRef = this.modalService.open(RteHelperModalComponent, {
       backdrop: 'static'
     });
-    modalRef.componentInstance.componentIsNewlyCreated = (
-      componentIsNewlyCreated);
     modalRef.componentInstance.customizationArgSpecs = customizationArgSpecs;
     modalRef.componentInstance.attrsCustomizationArgsDict = (
       attrsCustomizationArgsDict);
diff --git a/core/tests/webdriverio_desktop/extensions.js b/core/tests/webdriverio_desktop/extensions.js
index 06b13e1dbbd95..b887b908a6ba7 100644
--- a/core/tests/webdriverio_desktop/extensions.js
+++ b/core/tests/webdriverio_desktop/extensions.js
@@ -43,13 +43,9 @@ describe('rich-text components', function() {
   });
 
   it('should display correctly', async function() {
-    await users.createAndLoginCurriculumAdminUser(
+    await users.createAndLoginUser(
       'user@richTextComponents.com', 'userRichTextComponent');
 
-    await workflow.createTopic(
-      'topic 1', 'topic-one', 'topic 1 description', false);
-    await workflow.createSkillAndAssignTopic(
-      'skill 1', 'description 1', 'topic 1');
     await workflow.createExploration(true);
 
     await explorationEditorMainTab.setContent(async function(richTextEditor) {
@@ -70,11 +66,6 @@ describe('rich-text components', function() {
         title: 'title 1',
         content: await forms.toRichText('contents 2')
       }]);
-      // Test highlighting on Skillreview component.
-      await richTextEditor.appendPlainText('highlight');
-      await general.expectNoTextToBeSelected();
-      await richTextEditor.highlightText('highlight');
-      await richTextEditor.addRteComponent('Skillreview', null, 'skill 1');
     });
 
     await explorationEditorPage.navigateToPreviewTab();
@@ -95,8 +86,6 @@ describe('rich-text components', function() {
           title: 'title 1',
           content: await forms.toRichText('contents 2')
         }]);
-        await richTextChecker.readRteComponent(
-          'Skillreview', 'highlight', await forms.toRichText('description 1'));
       });
 
     await explorationEditorPage.discardChanges();
diff --git a/core/tests/webdriverio_utils/forms.js b/core/tests/webdriverio_utils/forms.js
index 2fb665dc64753..69156b94b1b9d 100644
--- a/core/tests/webdriverio_utils/forms.js
+++ b/core/tests/webdriverio_utils/forms.js
@@ -251,40 +251,6 @@ var RichTextEditor = async function(elem) {
       }
       await _clickToolbarButton('.cke_button__bulletedlist');
     },
-    // This finds and selects a certain text in the RTE.
-    // NOTE: This only selects the first occurrence of the text.
-    highlightText: async function(text) {
-      var paragraphNodes = await rteElements[0].$$('p');
-      var textNode = null;
-      var startIndex = -1;
-      var endIndex = -1;
-
-      for (var node of paragraphNodes) {
-        var nodeText = await node.getText();
-        var index = nodeText.indexOf(text);
-
-        if (index !== -1) {
-          textNode = node;
-          startIndex = index;
-          endIndex = index + text.length;
-          break;
-        }
-      }
-
-      if (!textNode || startIndex === -1 || endIndex === -1) {
-        throw new Error(
-          `Specified text ${text} to highlight not found in RTE`);
-      }
-
-      await browser.execute((element, start, end) => {
-        var range = document.createRange();
-        range.setStart(element.firstChild, start);
-        range.setEnd(element.firstChild, end);
-        var selection = window.getSelection();
-        selection.removeAllRanges();
-        selection.addRange(range);
-      }, textNode, startIndex, endIndex);
-    },
     // This adds and customizes RTE components.
     // Additional arguments may be sent to this function, and they will be
     // passed on to the relevant RTE component editor.
diff --git a/core/tests/webdriverio_utils/general.js b/core/tests/webdriverio_utils/general.js
index cff7f545b9ba9..9e86d2c770cd3 100644
--- a/core/tests/webdriverio_utils/general.js
+++ b/core/tests/webdriverio_utils/general.js
@@ -242,14 +242,6 @@ var checkConsoleErrorsExist = async function(expectedErrors) {
   }
 };
 
-// This function checks if any text is selected on the page.
-var expectNoTextToBeSelected = async function() {
-  expect(await browser.execute(function() {
-    var selection = window.getSelection();
-    return selection.toString() === '';
-  })).toBe(true);
-};
-
 var goToHomePage = async function() {
   var oppiaMainLogo = $('.e2e-test-oppia-main-logo');
   await action.click('Oppia Main Logo', oppiaMainLogo);
@@ -363,7 +355,6 @@ exports.expectErrorPage = expectErrorPage;
 exports.closeCurrentTabAndSwitchTo = closeCurrentTabAndSwitchTo;
 exports.dragAndDrop = dragAndDrop;
 exports.openAboutDropdown = openAboutDropdown;
-exports.expectNoTextToBeSelected = expectNoTextToBeSelected;
 
 exports.ensurePageHasNoTranslationIds = ensurePageHasNoTranslationIds;
 
diff --git a/core/tests/webdriverio_utils/workflow.js b/core/tests/webdriverio_utils/workflow.js
index 6d1f1ad312b7f..21457fca19dd0 100644
--- a/core/tests/webdriverio_utils/workflow.js
+++ b/core/tests/webdriverio_utils/workflow.js
@@ -323,15 +323,6 @@ var getExplorationPlaytesters = async function(isEmpty = false) {
   return await _getExplorationRoles('viewer', isEmpty);
 };
 
-var createTopic = async function(
-    topicName, topicUrlFragment, description, shouldCloseTopicEditor) {
-  var topicsAndSkillsDashboardPage = (
-    new TopicsAndSkillsDashboardPage.TopicsAndSkillsDashboardPage());
-  await topicsAndSkillsDashboardPage.get();
-  await topicsAndSkillsDashboardPage.createTopic(
-    topicName, topicUrlFragment, description, shouldCloseTopicEditor);
-};
-
 var createSkillAndAssignTopic = async function(
     skillDescription, material, topicName) {
   var topicsAndSkillsDashboardPage = (
@@ -445,6 +436,5 @@ exports.getExplorationCollaborators = getExplorationCollaborators;
 exports.getExplorationVoiceArtists = getExplorationVoiceArtists;
 exports.getExplorationPlaytesters = getExplorationPlaytesters;
 exports.createAddExpDetailsAndPublishExp = createAddExpDetailsAndPublishExp;
-exports.createTopic = createTopic;
 exports.createSkillAndAssignTopic = createSkillAndAssignTopic;
 exports.createQuestion = createQuestion;
diff --git a/extensions/objects/templates/skill-selector-editor.component.html b/extensions/objects/templates/skill-selector-editor.component.html
index 8a92922d27bd4..5a46c5eae24c8 100644
--- a/extensions/objects/templates/skill-selector-editor.component.html
+++ b/extensions/objects/templates/skill-selector-editor.component.html
@@ -6,7 +6,6 @@
            placeholder="Enter a skill name"
            [(ngModel)]="skillFilterText"
            (ngModelChange)="filterSkills($event)"
-           [disabled]="showLoading"
            autofocus>
   </mat-card>
   <div *ngIf="showLoading" class="oppia-align-center">
@@ -60,4 +59,7 @@
   .skill-selector-editor .oppia-list-group-item-text {
     color: #000;
   }
+  .skill-selector-editor .oppia-skill-summary-text {
+    color: #f00;
+  }
 </style>
diff --git a/extensions/objects/webdriverio.js b/extensions/objects/webdriverio.js
index 7e72a59921309..966abe34669df 100644
--- a/extensions/objects/webdriverio.js
+++ b/extensions/objects/webdriverio.js
@@ -294,10 +294,6 @@ var UnicodeStringEditor = function(elem) {
       await action.setValue(
         'Unicode String Editor Input', elem.$('<input>'), text);
     },
-    getValue: async function() {
-      return await action.getValue(
-        'Unicode String Editor Input', elem.$('<input>'));
-    },
     expectValueToBe: async function(expectedValue) {
       var value = await action.getAttribute(
         'Unicode Input Element', elem.$('<input>'), 'value');
diff --git a/extensions/rich_text_components/Skillreview/directives/noninteractive-skillreview-concept-card-modal.component.html b/extensions/rich_text_components/Skillreview/directives/noninteractive-skillreview-concept-card-modal.component.html
index 5988c5ef28074..a4a81a4a39f3b 100644
--- a/extensions/rich_text_components/Skillreview/directives/noninteractive-skillreview-concept-card-modal.component.html
+++ b/extensions/rich_text_components/Skillreview/directives/noninteractive-skillreview-concept-card-modal.component.html
@@ -7,7 +7,7 @@ <h3> {{ modalHeader }} </h3>
 </div>
 
 <div class="modal-footer">
-  <button class="btn btn-default e2e-test-close-concept-card"
+  <button class="btn btn-default"
           (click)="cancel()">
     Close
   </button>
diff --git a/extensions/rich_text_components/Skillreview/webdriverio.js b/extensions/rich_text_components/Skillreview/webdriverio.js
index c34290e0e404d..83e865ce2ff02 100644
--- a/extensions/rich_text_components/Skillreview/webdriverio.js
+++ b/extensions/rich_text_components/Skillreview/webdriverio.js
@@ -17,25 +17,18 @@
  * end-to-end testing with WebdriverIO.js
  */
 
-var action = require(process.cwd() + '/core/tests/webdriverio_utils/action.js');
 var objects = require(process.cwd() + '/extensions/objects/webdriverio.js');
 var forms = require(process.cwd() + '/core/tests/webdriverio_utils/forms.js');
 var waitFor = require(
   process.cwd() + '/core/tests/webdriverio_utils/waitFor.js');
 
 var customizeComponent = async function(modal, text, skillDescription) {
+  await objects.UnicodeStringEditor(
+    modal.$('<schema-based-unicode-editor>')
+  ).setValue(text);
   await objects.SkillSelector(
     modal.$('<skill-selector-editor>')
   ).setValue(skillDescription);
-
-  var textEditor = objects.UnicodeStringEditor(
-    modal.$('<schema-based-unicode-editor>'));
-  // Change the text only if is specified as an argument, as this component
-  // sometimes relies on highlights.
-  if (text === null || text === textEditor.getValue()) {
-    return;
-  }
-  await textEditor.setValue(text);
 };
 
 var expectComponentDetailsToMatch = async function(elem, text, reviewMaterial) {
@@ -49,8 +42,6 @@ var expectComponentDetailsToMatch = async function(elem, text, reviewMaterial) {
   await forms.expectRichText(
     $('.e2e-test-concept-card-explanation')
   ).toMatch(reviewMaterial);
-  await action.click(
-    'Concept Card close button', $('.e2e-test-close-concept-card'));
 };
 
 exports.customizeComponent = customizeComponent;