diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 09aec08ae9f..96f54bb1cfe 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -180,7 +180,14 @@ Bug Fixes
 
 * SOLR-5325: ZooKeeper connection loss can cause the Overseer to stop processing
   commands. (Christine Poerschke, Mark Miller, Jessica Cheng)
-  
+
+Other Changes
+----------------------
+
+* SOLR-5323: Disable ClusteringComponent by default in collection1 example.
+  The solr.clustering.enabled system property needs to be set to 'true'
+  to enable the clustering contrib (reverts SOLR-4708). (Dawid Weiss)
+
 ==================  4.5.0 ==================
 
 Versions of Major Components
diff --git a/solr/example/solr/collection1/conf/solrconfig.xml b/solr/example/solr/collection1/conf/solrconfig.xml
index 49517ecc0fa..35d2191fe4c 100755
--- a/solr/example/solr/collection1/conf/solrconfig.xml
+++ b/solr/example/solr/collection1/conf/solrconfig.xml
@@ -1380,11 +1380,16 @@
 
   <!-- Clustering Component
 
+       You'll need to set the solr.clustering.enabled system property
+       when running solr to run with clustering enabled:
+
+            java -Dsolr.clustering.enabled=true -jar start.jar
+
        http://wiki.apache.org/solr/ClusteringComponent
        http://carrot2.github.io/solr-integration-strategies/
     -->
   <searchComponent name="clustering"
-                   enable="${solr.clustering.enabled:true}"
+                   enable="${solr.clustering.enabled:false}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare a named clustering engine. Only one engine can be named 
          "default" (and it becomes the default one for the search component). 
@@ -1443,7 +1448,7 @@
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
-                  enable="${solr.clustering.enabled:true}"
+                  enable="${solr.clustering.enabled:false}"
                   class="solr.SearchHandler">
     <lst name="defaults">
       <bool name="clustering">true</bool>
diff --git a/solr/example/solr/collection1/conf/velocity/cluster.vm b/solr/example/solr/collection1/conf/velocity/cluster.vm
index c501cffe363..bfe2f3b8dc4 100644
--- a/solr/example/solr/collection1/conf/velocity/cluster.vm
+++ b/solr/example/solr/collection1/conf/velocity/cluster.vm
@@ -9,7 +9,7 @@
 
 ## Div tag has placeholder text by default
 <div id="clusters">
-  Loading...
+  Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see clustered search results.
 </div>
 
 ## Replace the div content *if* Carrot^2 is available