diff --git a/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java b/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java
index 6c11aea71cf1..5efcaae43693 100644
--- a/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java
+++ b/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java
@@ -88,33 +88,26 @@ public class BuildNumber implements Comparable<BuildNumber> {
   }
 
   public static BuildNumber fromString(String version) {
-    return fromString(version, null, null);
+    return fromString(version, null);
   }
 
-  public static BuildNumber fromStringWithProductCode(String version, String productCode) {
-    return fromString(version, null, productCode);
-  }
-
-  public static BuildNumber fromString(String version, @Nullable String pluginName, @Nullable String productCodeOverride) {
+  public static BuildNumber fromString(String version, @Nullable String name) {
     if (StringUtil.isEmptyOrSpaces(version)) return null;
 
     if (BUILD_NUMBER.equals(version) || SNAPSHOT.equals(version)) {
-      return new BuildNumber(productCodeOverride != null ? productCodeOverride : "", currentVersion().myComponents);
+      final String productCode = name != null ? name : "";
+      return new BuildNumber(productCode, currentVersion().myComponents);
     }
 
     String code = version;
     int productSeparator = code.indexOf('-');
     final String productCode;
-    if (productCodeOverride != null) {
-      productCode = productCodeOverride;
-    } else {
-      if (productSeparator > 0) {
-        productCode = code.substring(0, productSeparator);
-        code = code.substring(productSeparator + 1);
-      }
-      else {
-        productCode = "";
-      }
+    if (productSeparator > 0) {
+      productCode = code.substring(0, productSeparator);
+      code = code.substring(productSeparator + 1);
+    }
+    else {
+      productCode = "";
     }
 
     int baselineVersionSeparator = code.indexOf('.');
@@ -129,7 +122,7 @@ public class BuildNumber implements Comparable<BuildNumber> {
       TIntArrayList intComponentsList = new TIntArrayList();
 
       for (String stringComponent : stringComponents) {
-        int comp = parseBuildNumber(version, stringComponent, pluginName);
+        int comp = parseBuildNumber(version, stringComponent, name);
         intComponentsList.add(comp);
         if (comp == SNAPSHOT_VALUE) break;
       }
@@ -139,7 +132,7 @@ public class BuildNumber implements Comparable<BuildNumber> {
       return new BuildNumber(productCode, intComponents);
     }
     else {
-      buildNumber = parseBuildNumber(version, code, pluginName);
+      buildNumber = parseBuildNumber(version, code, name);
 
       if (buildNumber <= 2000) {
         // it's probably a baseline, not a build number
@@ -151,7 +144,7 @@ public class BuildNumber implements Comparable<BuildNumber> {
     }
   }
 
-  private static int parseBuildNumber(String version, String code, String pluginName) {
+  private static int parseBuildNumber(String version, String code, String name) {
     if (SNAPSHOT.equals(code) || BUILD_NUMBER.equals(code)) {
       return SNAPSHOT_VALUE;
     }
@@ -163,7 +156,7 @@ public class BuildNumber implements Comparable<BuildNumber> {
       return Integer.parseInt(code);
     }
     catch (NumberFormatException e) {
-      throw new RuntimeException("Invalid version number: " + version + "; plugin name: " + pluginName);
+      throw new RuntimeException("Invalid version number: " + version + "; plugin name: " + name);
     }
   }
 
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index 8bac27c7badf..5848250491fa 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -1245,12 +1245,12 @@ public class PluginManagerCore {
                                        @Nullable String descriptorName,
                                        @Nullable String descriptorDebugString) {
     JBIterable<String> messages = JBIterable.empty();
-    BuildNumber sinceBuildNumber = StringUtil.isEmpty(sinceBuild) ? null : BuildNumber.fromString(sinceBuild, descriptorName, null);
+    BuildNumber sinceBuildNumber = StringUtil.isEmpty(sinceBuild) ? null : BuildNumber.fromString(sinceBuild, descriptorName);
     if (sinceBuildNumber != null && sinceBuildNumber.compareTo(buildNumber) > 0) {
       messages = messages.append("since build " + sinceBuildNumber + " > " + buildNumber);
     }
 
-    BuildNumber untilBuildNumber = StringUtil.isEmpty(untilBuild) ? null : BuildNumber.fromString(untilBuild, descriptorName, null);
+    BuildNumber untilBuildNumber = StringUtil.isEmpty(untilBuild) ? null : BuildNumber.fromString(untilBuild, descriptorName);
     if (untilBuildNumber != null && untilBuildNumber.compareTo(buildNumber) < 0) {
       messages = messages.append("until build " + untilBuildNumber + " < " + buildNumber);
     }
diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index 005a1f055a43..43defb8bd35f 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -238,7 +238,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
 
   @Override
   public BuildNumber getBuild() {
-    return BuildNumber.fromStringWithProductCode(myBuildNumber, getProductPrefix());
+    return BuildNumber.fromString(myBuildNumber, getProductPrefix());
   }
 
   private static String getProductPrefix() {
@@ -256,7 +256,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
   public String getApiVersion() {
     BuildNumber build = getBuild();
     if (myApiVersion != null) {
-      BuildNumber api = BuildNumber.fromStringWithProductCode(myApiVersion, build.getProductCode());
+      BuildNumber api = BuildNumber.fromString(myApiVersion, build.getProductCode());
       if (api != null) {
         return api.asString();
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt
index 877ed2e1afce..03f5a2b24069 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt
@@ -56,7 +56,7 @@ class UpdateChannel(node: Element) {
 
 class BuildInfo(node: Element) {
   val number: BuildNumber = parseBuildNumber(node)
-  val apiVersion: BuildNumber = BuildNumber.fromStringWithProductCode(node.getAttributeValue("apiVersion"), number.productCode) ?: number
+  val apiVersion: BuildNumber = BuildNumber.fromString(node.getAttributeValue("apiVersion"), number.productCode) ?: number
   val version: String = node.getAttributeValue("version") ?: ""
   val message: String = node.getChild("message")?.value ?: ""
   val releaseDate: Date? = parseDate(node.getAttributeValue("releaseDate"))