diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 93b3eb5642..0c771879a9 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -1071,9 +1071,6 @@ bool DRAWING_TOOL::drawSegment( int aShape, DRAWSEGMENT*& aGraphic,
             // 45 degree lines
             if( direction45 && aShape == S_SEGMENT )
                 make45DegLine( aGraphic, &line45 );
-            else if( aShape == S_CIRCLE )
-                aGraphic->SetEnd( aGraphic->GetStart() + wxPoint(
-                        EuclideanNorm( wxPoint( cursorPos - aGraphic->GetStart() ) ), 0 ) );
             else
                 aGraphic->SetEnd( wxPoint( cursorPos.x, cursorPos.y ) );
 
diff --git a/pcbnew/tools/point_editor.cpp b/pcbnew/tools/point_editor.cpp
index 3c6dd10b7c..b9975c2e2d 100644
--- a/pcbnew/tools/point_editor.cpp
+++ b/pcbnew/tools/point_editor.cpp
@@ -165,11 +165,6 @@ public:
                     points->AddPoint( segment->GetCenter() );
                     points->AddPoint( segment->GetEnd() );
 
-                    // Set constraints
-                    // Circle end is on the horizontal axis with the center
-                    points->Point( CIRC_END ).SetConstraint(
-                            new EC_HORIZONTAL( points->Point( CIRC_END ),
-                                               points->Point( CIRC_CENTER ) ) );
                     break;
 
                 case S_POLYGON: