diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 91cde2bc09..710b181578 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-02-01  Pedro Alves  <palves@redhat.com>
+
+	* i386-tdep.c (i386_fast_tracepoint_valid_at): Use gdb_insn_length.
+
 2017-01-31  Pedro Alves  <palves@redhat.com>
 
 	* mi/mi-interp.c (mi_breakpoint_created, mi_breakpoint_modified):
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 8a4d59f6fd..b86c623c1b 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -8110,7 +8110,6 @@ i386_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
 			       char **msg)
 {
   int len, jumplen;
-  static struct ui_file *gdb_null = NULL;
 
   /*  Ask the target for the minimum instruction length supported.  */
   jumplen = target_get_min_fast_tracepoint_insn_len ();
@@ -8133,12 +8132,8 @@ i386_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
       jumplen = (register_size (gdbarch, 0) == 8) ? 5 : 4;
     }
 
-  /* Dummy file descriptor for the disassembler.  */
-  if (!gdb_null)
-    gdb_null = ui_file_new ();
-
   /* Check for fit.  */
-  len = gdb_print_insn (gdbarch, addr, gdb_null, NULL);
+  len = gdb_insn_length (gdbarch, addr);
 
   if (len < jumplen)
     {