diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 28ec848f7..36d2ae83e 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -92,23 +92,13 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
         rasterizer_type ras(ren);
         set_join_caps_aa(stroke_,ras);
 
-        typedef boost::mpl::vector<clip_line_tag, clip_poly_tag,transform_tag,
+        typedef boost::mpl::vector<clip_line_tag, transform_tag,
                                    offset_transform_tag, affine_transform_tag,
                                    smooth_tag, dash_tag, stroke_tag> conv_types;
         vertex_converter<box2d<double>, rasterizer_type, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
             converter(query_extent_,ras,sym,t_,prj_trans,tr,scaled);
-
-        if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
-        {
-            eGeomType type = feature.paths()[0].type();
-            if (type == Polygon)
-                converter.set<clip_poly_tag>();
-            else if (type == LineString)
-                converter.set<clip_line_tag>();
-            // don't clip if type==Point
-        }
-
+        if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
         converter.set<transform_tag>(); // always transform
         if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
         converter.set<affine_transform_tag>(); // optional affine transform
@@ -126,23 +116,14 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     }
     else
     {
-        typedef boost::mpl::vector<clip_line_tag, clip_poly_tag, transform_tag, offset_transform_tag,
+        typedef boost::mpl::vector<clip_line_tag, transform_tag, offset_transform_tag,
                                    affine_transform_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
 
         vertex_converter<box2d<double>, rasterizer, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
             converter(query_extent_,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
 
-        if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
-        {
-            eGeomType type = feature.paths()[0].type();
-            if (type == Polygon)
-                converter.set<clip_poly_tag>();
-            else if (type == LineString)
-                converter.set<clip_line_tag>();
-            // don't clip if type==Point
-        }
-
+        if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
         converter.set<transform_tag>(); // always transform
         if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
         converter.set<affine_transform_tag>(); // optional affine transform