diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -126,7 +126,7 @@ public class CollationController
                     if (cf.isMarkedForDelete())
                     {
                         // track the most recent row level tombstone we encounter
-                        mostRecentRowTombstone = cf.deletionInfo().maxTimestamp();
+                        mostRecentRowTombstone = cf.deletionInfo().getTopLevelDeletion().markedForDeleteAt;
                     }
 
                     container.delete(cf);
@@ -257,7 +257,7 @@ public class CollationController
                 {
                     ColumnFamily cf = iter.getColumnFamily();
                     if (cf.isMarkedForDelete())
-                        mostRecentRowTombstone = cf.deletionInfo().maxTimestamp();
+                        mostRecentRowTombstone = cf.deletionInfo().getTopLevelDeletion().markedForDeleteAt;
 
                     returnCF.delete(cf);
                     sstablesIterated++;
Only consider whole row tombstone in collation controller

patch by slebresne; reviewed by jbellis for CASSANDRA-<I>