diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
index 482e0b275..432734242 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
@@ -30,20 +30,13 @@
 							<target>
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 
-								<if>
-									<equals arg1="${p2.replaceQualifier}" arg2="true" />
-									<then>
-										<propertyregex property="shortQualifier" input="${buildQualifier}" regexp="[0-9a-z.A-Z]*\-(.*)" select="\1" casesensitive="false" />
-										<propertyregex property="build.id" input="${buildQualifier}" regexp="([0-9a-z.A-Z]*)\-.*" select="\1" casesensitive="false" />
+								<property name="qualifier" value="${unqualifiedVersion}.${p2.qualifier}" />
+								<property name="build.id" value="${buildQualifier}" />
 
-										<property name="qualifier" value="${unqualifiedVersion}.${shortQualifier}" />
-
-										<replace file="about.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
-										<replace file="about.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
-										<replace file="plugin.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
-										<replace file="plugin.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
-									</then>
-								</if>
+								<replace file="about.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
+								<replace file="about.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
+								<replace file="plugin.properties" token="@QUALIFIER@" value="${qualifier}" summary="yes" />
+								<replace file="plugin.properties" token="@BUILD_ID@" value="${build.id}" summary="yes" />
 							</target>
 						</configuration>
 						<goals>
@@ -59,7 +52,6 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<format>yyyyMMddHHmm</format>
-<!--					<format>yyyyMMddHHmm-'${p2.qualifier}'</format> -->
 					<archiveSite>false</archiveSite>
 					<archive>
 						<addMavenDescriptor>false</addMavenDescriptor>
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index de35d8db3..a029f68ec 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -71,7 +71,6 @@
 	</modules>
 
 	<properties>
-<!--		<p2.qualifier>SNAPSHOT</p2.qualifier> -->
 		<p2.qualifier>${buildQualifier}-SNAPSHOT</p2.qualifier>
 		<p2.sign>false</p2.sign>
 		<p2.repository.name>Spring Tool Suite</p2.repository.name>
@@ -751,20 +750,7 @@
 			</modules>
 
 		</profile>
-<!--
-		<profile>
-			<id>build.springsource.com</id>
-			<activation>
-				<property>
-					<name>bamboo.buildNumber</name>
-				</property>
-			</activation>
-			<properties>
-				<p2.qualifier>CI-B${bamboo.buildNumber}</p2.qualifier>
-				<p2.replaceQualifier>true</p2.replaceQualifier>
-			</properties>
-		</profile>
-	-->
+
 		<profile>
 			<id>bamboo-signing</id>
 			<properties>