diff --git a/conf/cassandra.xml b/conf/cassandra.xml
index eccfbf94f6..c070cb9098 100644
--- a/conf/cassandra.xml
+++ b/conf/cassandra.xml
@@ -53,7 +53,7 @@
    ~ org.apache.cassandra.locator.RackInferringSnitch and
    ~ org.apache.cassandra.locator.PropertyFileSnitch.
   -->
-  <EndpointSnitch>org.apache.cassandra.locator.RackInferringSnitch</EndpointSnitch>
+  <EndpointSnitch>org.apache.cassandra.locator.SimpleSnitch</EndpointSnitch>
 
   <!--
    ~ Keyspaces and ColumnFamilies:
diff --git a/src/java/org/apache/cassandra/locator/SimpleSnitch.java b/src/java/org/apache/cassandra/locator/SimpleSnitch.java
new file mode 100644
index 0000000000..b87a117639
--- /dev/null
+++ b/src/java/org/apache/cassandra/locator/SimpleSnitch.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.locator;
+
+import java.net.InetAddress;
+import java.util.*;
+
+/**
+ * A simple endpoint snitch implementation does not sort addresses by
+ * proximity.
+ */
+public class SimpleSnitch implements IEndpointSnitch
+{
+    public List<InetAddress> getSortedListByProximity(final InetAddress address, Collection<InetAddress> addresses)
+    {
+        List<InetAddress> list = new ArrayList<InetAddress>(addresses);
+        return list;
+    }
+
+    public List<InetAddress> sortByProximity(final InetAddress address, List<InetAddress> addresses)
+    {
+        return addresses;
+    }
+}
diff --git a/test/conf/cassandra.xml b/test/conf/cassandra.xml
index d6c094b2ec..e3e4749e1d 100644
--- a/test/conf/cassandra.xml
+++ b/test/conf/cassandra.xml
@@ -37,7 +37,7 @@
    <DiskAccessMode>mmap</DiskAccessMode>
    <MemtableThroughputInMB>1</MemtableThroughputInMB>
    <MemtableOperationsInMillions>0.00002</MemtableOperationsInMillions> <!-- 20 -->
-   <EndpointSnitch>org.apache.cassandra.locator.RackInferringSnitch</EndpointSnitch>
+   <EndpointSnitch>org.apache.cassandra.locator.SimpleSnitch</EndpointSnitch>
    <Keyspaces>
      <Keyspace Name = "Keyspace1">
        <ColumnFamily Name="Standard1" RowsCached="10%" KeysCached="0"/>