diff --git a/CHANGES.txt b/CHANGES.txt
index 524e776800..e8b63d64d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -34,6 +34,8 @@
  * Fix installing as service on Windows (CASSANDRA-8115)
  * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
  * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
+Merged from 2.0:
+ * Pig: Remove errant LIMIT clause in CqlNativeStorage
 
 
 2.1.1
diff --git a/debian/changelog b/debian/changelog
index 4e240eb06f..853dd6a353 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,5 @@
 cassandra (2.1.1) unstable; urgency=medium
+=======
 
   * New release
 
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index c12a14538c..da54d8b0ca 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -96,7 +96,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
     private IPartitioner partitioner;
     private String inputColumns;
     private String userDefinedWhereClauses;
-    private int pageRowSize;
 
     private List<String> partitionKeys = new ArrayList<>();
 
@@ -121,14 +120,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         inputColumns = CqlConfigHelper.getInputcolumns(conf);
         userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf);
         Optional<Integer> pageRowSizeOptional = CqlConfigHelper.getInputPageRowSize(conf);
-        try
-        {
-            pageRowSize = pageRowSizeOptional.isPresent() ? pageRowSizeOptional.get() : DEFAULT_CQL_PAGE_LIMIT;
-        }
-        catch(NumberFormatException e)
-        {
-            pageRowSize = DEFAULT_CQL_PAGE_LIMIT;
-        }
+
         try
         {
             if (cluster != null)
@@ -153,7 +145,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         // otherwise we will fall back to building a query using the:
         //   inputColumns
         //   whereClauses
-        //   pageRowSize
         cqlQuery = CqlConfigHelper.getInputCql(conf);
         // validate that the user hasn't tried to give us a custom query along with input columns
         // and where clauses
@@ -554,8 +545,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
     /**
      * Build a query for the reader of the form:
      *
-     * SELECT * FROM ks>cf token(pk1,...pkn)>? AND token(pk1,...pkn)<=? [AND user where clauses]
-     * LIMIT pageRowSize [ALLOW FILTERING]
+     * SELECT * FROM ks>cf token(pk1,...pkn)>? AND token(pk1,...pkn)<=? [AND user where clauses] [ALLOW FILTERING]
      */
     private String buildQuery()
     {
@@ -574,7 +564,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         String whereClause = "";
         if (StringUtils.isNotEmpty(userDefinedWhereClauses))
             whereClause += " AND " + userDefinedWhereClauses;
-        whereClause += " LIMIT " + pageRowSize;
         if (StringUtils.isNotEmpty(userDefinedWhereClauses))
             whereClause += " ALLOW FILTERING";
         return whereClause;