diff --git a/spec.bs b/spec.bs
index e5a21e76..c3fd169d 100644
--- a/spec.bs
+++ b/spec.bs
@@ -1688,8 +1688,7 @@ successful [=navigate|navigation=] to a [=top-level traversable=].
   1. Let |beacon data| be |config|'s [=fenced frame config instance/fenced frame reporter=]'s
      [=fenced frame reporter/automatic beacon data=].
 
-  1. Let |event data| be |beacon data|'s [=automatic beacon data/eventData=] if |beacon data| is not
-     null, the empty string otherwise.
+  1. If |beacon data| is null, abort these steps.
 
   1. If |sourceOrigin| is not [=same origin=] with |config|'s [=fenced frame config instance/mapped
      url=]'s [=url/origin=], abort these steps.
@@ -1698,11 +1697,6 @@ successful [=navigate|navigation=] to a [=top-level traversable=].
      reporter=]'s [=fenced frame reporter/fenced frame reporting metadata reference=]'s
      [=fencedframetype/fenced frame reporting map=]'s [=map/keys=]:
 
-    1. Let |eventData| be an empty [=string=].
-
-    1. If |beacon data|'s [=automatic beacon data/destinations=] [=list/contains=] |destination|,
-       set |eventData| to |event data|.
-
     1. Run [=report an event=] using |config|'s [=fenced frame config instance/fenced frame
        reporter=] with |destination| and a [=fencedframetype/destination enum event=] with the
        following [=struct/items=]:
@@ -1711,7 +1705,8 @@ successful [=navigate|navigation=] to a [=top-level traversable=].
        :: |eventType|
 
        : [=destination enum event/data=]
-       :: |eventData|
+       :: |beacon data|'s [=automatic beacon data/eventData=] if |beacon data|'s [=automatic beacon
+          data/destinations=] [=list/contains=] |destination|, the empty string otherwise.
 
        : [=destination enum event/attributionReportingEnabled=]
        :: |sourceSnapshotParams|'s [=source snapshot params/attribution reporting enabled=]
@@ -1729,6 +1724,7 @@ successful [=navigate|navigation=] to a [=top-level traversable=].
     /fenced-frame/automatic-beacon-two-events-persist.https.html
     /fenced-frame/automatic-beacon-unfenced-top.https.html
     /fenced-frame/automatic-beacon-no-destination.https.html
+    /fenced-frame/automatic-beacon-no-opt-in.https.html
   </wpt>
 </div>