diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fad36f4551..f31edc51f5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-09  Andrew Burgess  <aburgess@broadcom.com>
+
+	* value.c (value_bits_valid): Revert previous change, and change
+	by Pedro on 2013-07-04, due to regressions in
+	gdb.dwarf2/implptr.exp and gdb.dwarf2/pieces.exp.
+
 2013-07-08  Andrew Burgess  <aburgess@broadcom.com>
             Pedro Alves  <palves@redhat.com>
 
diff --git a/gdb/value.c b/gdb/value.c
index 1be1845657..ce4b13a17a 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1082,12 +1082,13 @@ value_entirely_optimized_out (const struct value *value)
 int
 value_bits_valid (const struct value *value, int offset, int length)
 {
+  if (!value->optimized_out)
+    return 1;
   if (value->lval != lval_computed
       || !value->location.computed.funcs->check_validity)
-    return !value->optimized_out;
-  else
-    return value->location.computed.funcs->check_validity (value, offset,
-							   length);
+    return 0;
+  return value->location.computed.funcs->check_validity (value, offset,
+							 length);
 }
 
 int