diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ba45ff4239..c569d568ff 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-06  Pedro Alves  <palves@redhat.com>
+
+	* inflow.c (child_terminal_inferior, child_terminal_ours_1): No
+	longer set flags twice in row.
+
 2017-11-06  Pedro Alves  <palves@redhat.com>
 
 	* Makefile.in (SER_HARDWIRE): Update comment.
diff --git a/gdb/inflow.c b/gdb/inflow.c
index a96d4fc4a5..d46d6938e2 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -244,10 +244,6 @@ child_terminal_inferior (struct target_ops *self)
       int result;
 
 #ifdef F_GETFL
-      /* Is there a reason this is being done twice?  It happens both
-         places we use F_SETFL, so I'm inclined to think perhaps there
-         is some reason, however perverse.  Perhaps not though...  */
-      result = fcntl (0, F_SETFL, tinfo->tflags);
       result = fcntl (0, F_SETFL, tinfo->tflags);
       OOPSY ("fcntl F_SETFL");
 #endif
@@ -403,11 +399,6 @@ child_terminal_ours_1 (int output_only)
 
 #ifdef F_GETFL
       tinfo->tflags = fcntl (0, F_GETFL, 0);
-
-      /* Is there a reason this is being done twice?  It happens both
-         places we use F_SETFL, so I'm inclined to think perhaps there
-         is some reason, however perverse.  Perhaps not though...  */
-      result = fcntl (0, F_SETFL, our_terminal_info.tflags);
       result = fcntl (0, F_SETFL, our_terminal_info.tflags);
 #endif
     }