diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 25fccf3873..62316bbd81 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-04  Gary Benson  <gbenson@redhat.com>
+
+	* x86-linux-nat.c (x86_linux_dr_get, x86_linux_dr_set):
+	Remove code to cope with LWPs wrapped as PIDs.
+	Add assertions to ensure no wrapped LWPs are passed.
+
 2014-09-04  Pedro Alves  <palves@redhat.com>
 
 	* value.c (value_ranges_copy_adjusted): New function, factored out
diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index 0d070dda9f..67300d8053 100644
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -60,9 +60,8 @@ x86_linux_dr_get (ptid_t ptid, int regnum)
   int tid;
   unsigned long value;
 
+  gdb_assert (ptid_lwp_p (ptid));
   tid = ptid_get_lwp (ptid);
-  if (tid == 0)
-    tid = ptid_get_pid (ptid);
 
   errno = 0;
   value = ptrace (PTRACE_PEEKUSER, tid,
@@ -80,9 +79,8 @@ x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
 {
   int tid;
 
+  gdb_assert (ptid_lwp_p (ptid));
   tid = ptid_get_lwp (ptid);
-  if (tid == 0)
-    tid = ptid_get_pid (ptid);
 
   errno = 0;
   ptrace (PTRACE_POKEUSER, tid,