2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e50324d5..ecd9305a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-07-03         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
+	* field.c (rebuild_record): Revert warning message regarding flags,
+	since I'm not yet totally confident that it is invalid to have FIELD
+	and MALLOC set at the same time.
+
+2016-07-03         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
 	* field.c (rebuild_record): Do not turn off the STRING flag when
 	copying a FIELD node, and issue a warning if MALLOC is enabled.
 
diff --git a/field.c b/field.c
index 5e5a3511..892818f7 100644
--- a/field.c
+++ b/field.c
@@ -216,11 +216,7 @@ rebuild_record()
 				}
 			} else {
 				*n = *r;
-				if (n->flags & MALLOC) {
-					/* unexpected, since FIELD is on! */
-					warning(_("invalid flags combination `%s' detected while rebuilding record; please file a bug report."), flags2str(n->flags));
-					n->flags &= ~MALLOC;
-				}
+				n->flags &= ~MALLOC;
 			}
 
 			n->stptr = cops;