diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e48ea99629..6ce1e52623 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-22  Pedro Alves  <palves@redhat.com>
+
+	* value.c (allocate_optimized_out_value): Don't mark value as
+	non-lazy.
+
 2014-07-22  Jiong Wang  <jiong.wang@arm.com>
 
 	* MAINTAINERS (Write After Approval): Update my email address.
diff --git a/gdb/value.c b/gdb/value.c
index 29abe5f718..8b44a6d331 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -906,7 +906,10 @@ allocate_optimized_out_value (struct type *type)
   struct value *retval = allocate_value_lazy (type);
 
   set_value_optimized_out (retval, 1);
-  set_value_lazy (retval, 0);
+  /* FIXME: we should be able to avoid allocating the value's contents
+     buffer, but value_available_contents_bits_eq can't handle
+     that.  */
+  /* set_value_lazy (retval, 0); */
   return retval;
 }