diff --git a/src/cairo-path-stroke-polygon.c b/src/cairo-path-stroke-polygon.c
index 919e7db08..88527f5b2 100644
--- a/src/cairo-path-stroke-polygon.c
+++ b/src/cairo-path-stroke-polygon.c
@@ -1052,7 +1052,6 @@ line_to (void *closure,
     cairo_stroke_face_t start;
     cairo_point_t *p1 = &stroker->current_face.point;
     cairo_slope_t dev_slope;
-    int move_last = 0;
 
     stroker->has_initial_sub_path = TRUE;
 
@@ -1069,9 +1068,7 @@ line_to (void *closure,
     if (stroker->has_current_face) {
 	int clockwise = _cairo_slope_compare (&stroker->current_face.dev_vector,
 					      &start.dev_vector);
-	if (clockwise == 0) {
-	    move_last = 1;
-	} else {
+	if (clockwise) {
 	    clockwise = clockwise < 0;
 	    /* Join with final face from previous segment */
 	    if (! within_tolerance (&stroker->current_face.ccw, &start.ccw,
@@ -1102,13 +1099,8 @@ line_to (void *closure,
     stroker->current_face.cw.x += dev_slope.dx;
     stroker->current_face.cw.y += dev_slope.dy;
 
-    if (move_last) {
-	*_cairo_contour_last_point (&stroker->cw.contour) = stroker->current_face.cw;
-	*_cairo_contour_last_point (&stroker->ccw.contour) = stroker->current_face.ccw;
-    } else {
-	contour_add_point (stroker, &stroker->cw, &stroker->current_face.cw);
-	contour_add_point (stroker, &stroker->ccw, &stroker->current_face.ccw);
-    }
+    contour_add_point (stroker, &stroker->cw, &stroker->current_face.cw);
+    contour_add_point (stroker, &stroker->ccw, &stroker->current_face.ccw);
 
     return CAIRO_STATUS_SUCCESS;
 }
diff --git a/test/reference/arc-direction.traps.argb32.ref.png b/test/reference/arc-direction.traps.argb32.ref.png
deleted file mode 100644
index 280c09b6e..000000000
Binary files a/test/reference/arc-direction.traps.argb32.ref.png and /dev/null differ
diff --git a/test/reference/arc-direction.traps.rgb24.ref.png b/test/reference/arc-direction.traps.rgb24.ref.png
deleted file mode 100644
index 280c09b6e..000000000
Binary files a/test/reference/arc-direction.traps.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/close-path-current-point.argb32.ref.png b/test/reference/close-path-current-point.argb32.ref.png
deleted file mode 100644
index ab3124b79..000000000
Binary files a/test/reference/close-path-current-point.argb32.ref.png and /dev/null differ
diff --git a/test/reference/close-path-current-point.ref.png b/test/reference/close-path-current-point.ref.png
index 9d3fd248d..3ae490031 100644
Binary files a/test/reference/close-path-current-point.ref.png and b/test/reference/close-path-current-point.ref.png differ
diff --git a/test/reference/close-path-current-point.rgb24.ref.png b/test/reference/close-path-current-point.rgb24.ref.png
deleted file mode 100644
index ab3124b79..000000000
Binary files a/test/reference/close-path-current-point.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/fallback.traps.argb32.ref.png b/test/reference/fallback.traps.argb32.ref.png
index b7ce57363..c0c5f4676 100644
Binary files a/test/reference/fallback.traps.argb32.ref.png and b/test/reference/fallback.traps.argb32.ref.png differ
diff --git a/test/reference/fallback.traps.rgb24.ref.png b/test/reference/fallback.traps.rgb24.ref.png
index 16d3c14e4..18b6a7c83 100644
Binary files a/test/reference/fallback.traps.rgb24.ref.png and b/test/reference/fallback.traps.rgb24.ref.png differ
diff --git a/test/reference/halo.argb32.ref.png b/test/reference/halo.argb32.ref.png
deleted file mode 100644
index 191ee4794..000000000
Binary files a/test/reference/halo.argb32.ref.png and /dev/null differ
diff --git a/test/reference/halo.ref.png b/test/reference/halo.ref.png
index ebe0c6103..a2b7ae159 100644
Binary files a/test/reference/halo.ref.png and b/test/reference/halo.ref.png differ
diff --git a/test/reference/halo.rgb24.ref.png b/test/reference/halo.rgb24.ref.png
deleted file mode 100644
index 191ee4794..000000000
Binary files a/test/reference/halo.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/halo.traps.argb32.ref.png b/test/reference/halo.traps.argb32.ref.png
deleted file mode 100644
index 191ee4794..000000000
Binary files a/test/reference/halo.traps.argb32.ref.png and /dev/null differ
diff --git a/test/reference/halo.traps.rgb24.ref.png b/test/reference/halo.traps.rgb24.ref.png
deleted file mode 100644
index 191ee4794..000000000
Binary files a/test/reference/halo.traps.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/rounded-rectangle-stroke.argb32.ref.png b/test/reference/rounded-rectangle-stroke.argb32.ref.png
deleted file mode 100644
index 3f2a1fb2c..000000000
Binary files a/test/reference/rounded-rectangle-stroke.argb32.ref.png and /dev/null differ
diff --git a/test/reference/rounded-rectangle-stroke.ref.png b/test/reference/rounded-rectangle-stroke.ref.png
index b0f1b07aa..62857501f 100644
Binary files a/test/reference/rounded-rectangle-stroke.ref.png and b/test/reference/rounded-rectangle-stroke.ref.png differ
diff --git a/test/reference/rounded-rectangle-stroke.rgb24.ref.png b/test/reference/rounded-rectangle-stroke.rgb24.ref.png
deleted file mode 100644
index 3f2a1fb2c..000000000
Binary files a/test/reference/rounded-rectangle-stroke.rgb24.ref.png and /dev/null differ