diff --git a/org.eclipse.jdt.core.tests.model/forceQualifierUpdate.txt b/org.eclipse.jdt.core.tests.model/forceQualifierUpdate.txt
new file mode 100644
index 0000000..df0d3fd
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update, add the bug here
+Bug 489604 - should not override <timestampProvider>
diff --git a/org.eclipse.jdt.core.tests.model/pom.xml b/org.eclipse.jdt.core.tests.model/pom.xml
index 8349d07..30eb075 100644
--- a/org.eclipse.jdt.core.tests.model/pom.xml
+++ b/org.eclipse.jdt.core.tests.model/pom.xml
@@ -30,14 +30,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <format>'v${buildTimestamp}'</format>
-        </configuration>
-      </plugin>
-      <plugin>
       	<groupId>org.eclipse.tycho</groupId>
       	<artifactId>tycho-surefire-plugin</artifactId>
       	<version>${tycho.version}</version>
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java
index d3f5ca1..f727e3f 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java
@@ -12443,4 +12443,19 @@
 		"}";
 	formatSource(source);
 }
+/**
+ * https://bugs.eclipse.org/492735 - [formatter] Excessive wrapping in a complex expression
+ */
+public void testBug492735() {
+	this.formatterPrefs.alignment_for_assignment = Alignment.M_COMPACT_SPLIT;
+	this.formatterPrefs.page_width = 60;
+	String source =
+		"class FormatterIssue {\r\n" + 
+		"	String[] S = new String[] {\r\n" + 
+		"			foo(\"first line  xxxxxxxxxxx\", \"y\", \"z\"),\r\n" + 
+		"			foo(\"second line xxxxxxxxxxxxxxxxxxx\", \"b\",\r\n" + 
+		"					\"c\"), };\r\n" + 
+		"}";
+	formatSource(source);
+}
 }