diff --git a/cql3/column_identifier.hh b/cql3/column_identifier.hh
index 624fad3368..28b643d466 100644
--- a/cql3/column_identifier.hh
+++ b/cql3/column_identifier.hh
@@ -180,12 +180,6 @@ public:
         }
 
 #if 0
-        @Override
-        public final int hashCode()
-        {
-            return text.hashCode();
-        }
-
         @Override
         public final boolean equals(Object o)
         {
@@ -199,6 +193,8 @@ public:
         virtual sstring to_string() const {
             return _text;
         }
+
+        friend std::hash<column_identifier::raw>;
     };
 };
 
@@ -218,6 +214,12 @@ struct hash<cql3::column_identifier> {
     }
 };
 
+template<>
+struct hash<cql3::column_identifier::raw> {
+    size_t operator()(const cql3::column_identifier::raw& r) const {
+        return std::hash<sstring>()(r._text);
+    }
+};
 
 }