diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ac191d1e93..8deed48464 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+	* target-delegates.c: Rebuild.
+	* target.c (update_current_target): Don't inherit or default
+	to_set_trace_notes.
+	* target.h (struct target_ops) <to_set_trace_notes>: Use
+	TARGET_DEFAULT_RETURN.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
 	* target-delegates.c: Rebuild.
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index d482a7285b..562ccfdac2 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -907,6 +907,19 @@ tdefault_set_trace_buffer_size (struct target_ops *self, LONGEST arg1)
 {
 }
 
+static int
+delegate_set_trace_notes (struct target_ops *self, const char *arg1, const char *arg2, const char *arg3)
+{
+  self = self->beneath;
+  return self->to_set_trace_notes (self, arg1, arg2, arg3);
+}
+
+static int
+tdefault_set_trace_notes (struct target_ops *self, const char *arg1, const char *arg2, const char *arg3)
+{
+  return 0;
+}
+
 static int
 delegate_supports_btrace (struct target_ops *self)
 {
@@ -1077,6 +1090,8 @@ install_delegators (struct target_ops *ops)
     ops->to_set_circular_trace_buffer = delegate_set_circular_trace_buffer;
   if (ops->to_set_trace_buffer_size == NULL)
     ops->to_set_trace_buffer_size = delegate_set_trace_buffer_size;
+  if (ops->to_set_trace_notes == NULL)
+    ops->to_set_trace_notes = delegate_set_trace_notes;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
 }
@@ -1161,5 +1176,6 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_set_disconnected_tracing = tdefault_set_disconnected_tracing;
   ops->to_set_circular_trace_buffer = tdefault_set_circular_trace_buffer;
   ops->to_set_trace_buffer_size = tdefault_set_trace_buffer_size;
+  ops->to_set_trace_notes = tdefault_set_trace_notes;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }
diff --git a/gdb/target.c b/gdb/target.c
index febf07bc22..e0b5efbfd2 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -707,7 +707,7 @@ update_current_target (void)
       /* Do not inherit to_set_disconnected_tracing.  */
       /* Do not inherit to_set_circular_trace_buffer.  */
       /* Do not inherit to_set_trace_buffer_size.  */
-      INHERIT (to_set_trace_notes, t);
+      /* Do not inherit to_set_trace_notes.  */
       INHERIT (to_get_tib_address, t);
       INHERIT (to_set_permissions, t);
       INHERIT (to_static_tracepoint_marker_at, t);
@@ -750,10 +750,6 @@ update_current_target (void)
 	    (void (*) (struct target_ops *, ptid_t))
 	    target_ignore);
   current_target.to_read_description = NULL;
-  de_fault (to_set_trace_notes,
-	    (int (*) (struct target_ops *,
-		      const char *, const char *, const char *))
-	    return_zero);
   de_fault (to_get_tib_address,
 	    (int (*) (struct target_ops *, ptid_t, CORE_ADDR *))
 	    tcomplain);
diff --git a/gdb/target.h b/gdb/target.h
index 7f672ebadf..a82a2dd58f 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -905,7 +905,8 @@ struct target_ops
        successful, 0 otherwise.  */
     int (*to_set_trace_notes) (struct target_ops *,
 			       const char *user, const char *notes,
-			       const char *stopnotes);
+			       const char *stopnotes)
+      TARGET_DEFAULT_RETURN (0);
 
     /* Return the processor core that thread PTID was last seen on.
        This information is updated only when: