diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/CommitContext.java b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/CommitContext.java
index 62acfd29059a..96650679030c 100644
--- a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/CommitContext.java
+++ b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/CommitContext.java
@@ -15,28 +15,7 @@
  */
 package com.intellij.openapi.vcs.changes;
 
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.UserDataHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import com.intellij.openapi.util.UserDataHolderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-
-public class CommitContext implements UserDataHolder {
-  private final Map<Key, Object> myMap;
-
-  public CommitContext() {
-    myMap = new HashMap<>();
-  }
-
-  @Override
-  public <T> T getUserData(@NotNull Key<T> key) {
-    return (T)myMap.get(key);
-  }
-
-  @Override
-  public <T> void putUserData(@NotNull Key<T> key, @Nullable T value) {
-    myMap.put(key, value);
-  }
+public class CommitContext extends UserDataHolderBase {
 }