Revert "SERVER-4262 sharded indexing depends on the db sharding status"

This reverts commit 13aa0a0276eb239454da00d65f8f15aa1a97bb10.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mongo/s/strategy_shard.cpp b/src/mongo/s/strategy_shard.cpp
index bacd38925ce..30157566277 100644
--- a/src/mongo/s/strategy_shard.cpp
+++ b/src/mongo/s/strategy_shard.cpp
@@ -888,14 +888,19 @@ namespace mongo {
             // TODO: This block goes away, system.indexes needs to handle better
             if( isIndexWrite ){
 
-                if ( r.getConfig()->isShardingEnabled() ){
+                ShardPtr primary;
+                ChunkManagerPtr manager;
+
+                r.getConfig()->getChunkManagerOrPrimary( ns, manager, primary );
+
+                if ( manager ){
                     LOG(1) << "sharded index write for " << ns << endl;
                     handleIndexWrite( op , r );
                     return;
                 }
 
                 LOG(3) << "single index write for " << ns << endl;
-                SINGLE->doWrite( op , r , Shard( r.getConfig()->getPrimary() ) );
+                SINGLE->doWrite( op , r , *primary );
                 r.gotInsert(); // Won't handle mulit-insert correctly. Not worth parsing the request.
 
                 return;