Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java	(revision 1521818)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java	(working copy)
@@ -57,14 +57,6 @@
      */
     public static final boolean JACKRABBIT_2_SINGLE_QUOTED_PHRASE = true;
 
-    /**
-     * Compatibility for Jackrabbit 2.0 queries with ampersand.
-     * (contains(., "max&moritz"))
-     * The ampersand is converted to a space, and a search is made for the 
-     * two words "max" and "moritz" (not a phrase search).
-     */
-    public static final boolean JACKRABBIT_2_AMPERSAND_TO_SPACE = true;
-
     private final String selectorName;
     private final String relativePath;
     private final String propertyName;
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java	(revision 1521818)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java	(working copy)
@@ -45,11 +45,6 @@
     public static FullTextExpression parse(String propertyName, String text) throws ParseException {
         FullTextParser p = new FullTextParser();
         p.propertyName = propertyName;
-        if (FullTextSearchImpl.JACKRABBIT_2_AMPERSAND_TO_SPACE) {
-            if (text.indexOf('&') >= 0) {
-                text = text.replace('&', ' ');
-            }
-        }
         p.text = text;
         FullTextExpression e = p.parseOr();
         return e;
@@ -203,4 +198,4 @@
         return new ParseException("FullText expression: " + query, index);
     }
 
-}
\ No newline at end of file
+}
Index: oak-lucene/pom.xml
===================================================================
--- oak-lucene/pom.xml	(revision 1521818)
+++ oak-lucene/pom.xml	(working copy)
@@ -91,8 +91,6 @@
       org.apache.jackrabbit.core.query.SimpleQueryTest#testNegativeNumber                            <!-- OAK-327 -->
       org.apache.jackrabbit.core.query.SQL2OrderByTest#testOrderByScore
       org.apache.jackrabbit.oak.jcr.query.QueryFulltextTest#testFulltextRelativeProperty             <!-- OAK-828 -->
-      org.apache.jackrabbit.core.query.FulltextQueryTest#testPredefinedEntityReference             <!-- OAK-XXX -->
-
     </known.issues>
   </properties>