diff --git a/CHANGES.txt b/CHANGES.txt
index aaf62492aa2..abb1a3e238e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -257,7 +257,10 @@ Release 0.21.0 - Unreleased
    HBASE-2358  Store doReconstructionLog will fail if oldlogfile.log is empty
                and won't load region (Cosmin Lehene via Stack)
    HBASE-2370  saveVersion.sh doesnt properly grab the git revision
+   HBASE-2373  Remove confusing log message of how "BaseScanner GET got
+               different address/startcode than SCAN"
    HBASE-2361  WALEdit broke replication scope
+   HBASE-2365  Double-assignment around split
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java b/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java
index 636b4a95815..24f9c14cced 100644
--- a/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java
+++ b/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java
@@ -960,7 +960,7 @@ public class RegionManager implements HConstants {
         regionsInTransition.put(info.getRegionNameAsString(), s);
       }
     }
-    if (force || (!s.isPendingOpen() || !s.isOpen())) {
+    if (force || (!s.isPendingOpen() && !s.isOpen())) {
       s.setUnassigned();
     }
   }