diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 1069b5d9c0..c99505fba7 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-26  Pedro Alves  <palves@redhat.com>
+
+	* server.c (handle_qxfer_libraries): Don't bail early if
+	the_target->qxfer_libraries_svr4 is not NULL.
+
 2012-03-26  Pedro Alves  <palves@redhat.com>
 
 	* linux-low.c (linux_qxfer_libraries_svr4): Fix pasto in comment.
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index a4e9e57fc3..9c7159f3d5 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1015,10 +1015,6 @@ handle_qxfer_libraries (const char *annex,
   if (annex[0] != '\0' || !target_running ())
     return -1;
 
-  /* Do not confuse this packet with qXfer:libraries-svr4:read.  */
-  if (the_target->qxfer_libraries_svr4 != NULL)
-    return 0;
-
   /* Over-estimate the necessary memory.  Assume that every character
      in the library name must be escaped.  */
   total_len = 64;