diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index c2187eb569d8077a2a96d91497ebff88ea1a360b..552cc24ac176da419fb4b62d92762ba03747d9ff 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -8109,12 +8109,7 @@ class LUAddTags(TagsLU):
         self.target.AddTag(tag)
     except errors.TagError, err:
       raise errors.OpExecError("Error while setting tag: %s" % str(err))
-    try:
-      self.cfg.Update(self.target, feedback_fn)
-    except errors.ConfigurationError:
-      raise errors.OpRetryError("There has been a modification to the"
-                                " config file and the operation has been"
-                                " aborted. Please retry.")
+    self.cfg.Update(self.target, feedback_fn)
 
 
 class LUDelTags(TagsLU):
@@ -8148,12 +8143,7 @@ class LUDelTags(TagsLU):
     """
     for tag in self.op.tags:
       self.target.RemoveTag(tag)
-    try:
-      self.cfg.Update(self.target, feedback_fn)
-    except errors.ConfigurationError:
-      raise errors.OpRetryError("There has been a modification to the"
-                                " config file and the operation has been"
-                                " aborted. Please retry.")
+    self.cfg.Update(self.target, feedback_fn)
 
 
 class LUTestDelay(NoHooksLU):
diff --git a/lib/errors.py b/lib/errors.py
index 9fd9868e665dbdd957ddd009723a6d670ba99f17..40a0ae7d89f1d80a51b3036712241a1e9fb31163 100644
--- a/lib/errors.py
+++ b/lib/errors.py
@@ -134,12 +134,6 @@ class OpExecError(GenericError):
   """
 
 
-class OpRetryError(OpExecError):
-  """Error during OpCode execution, action can be retried.
-
-  """
-
-
 class OpCodeUnknown(GenericError):
   """Unknown opcode submitted.