diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp
index c3ad53996..4d26bdd0f 100644
--- a/plugins/input/csv/csv_datasource.cpp
+++ b/plugins/input/csv/csv_datasource.cpp
@@ -579,12 +579,7 @@ void csv_datasource::parse_csv(T& stream,
                         desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::String));
                 }
                 // only true strings are this long
-                else if (value_length > 20 
-                         // TODO - clean up this messiness which is here temporarily
-                         // to protect against the improperly working spirit parsing below
-                         || value.find(",") != std::string::npos
-                         || value.find(":") != std::string::npos
-                         || (std::count(value.begin(), value.end(), '-') > 1))
+                else if (value_length > 20)
                 {
                     UnicodeString ustr = tr.transcode(value.c_str());
                     boost::put(*feature,fld_name,ustr);
diff --git a/tests/data/csv/nypd.csv b/tests/data/csv/nypd.csv
new file mode 100644
index 000000000..acd2c1a38
--- /dev/null
+++ b/tests/data/csv/nypd.csv
@@ -0,0 +1,3 @@
+Precinct,Phone,Address,City,geo_longitude,geo_latitude,geo_accuracy
+5th Precinct,(212) 334-0711,19 Elizabeth Street,"New York, NY",-70.0,40.0,house
+9th Precinct,(212) 477-7811,130 Avenue C,"New York, NY",-73.0,41.0,house
\ No newline at end of file