diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java
index 8190735995..8e78ec0104 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReview.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReview.java
@@ -135,7 +135,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;
 import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -334,11 +333,9 @@ public class PostReview
         // User posting this review isn't currently in the reviewer or CC list,
         // isn't being explicitly added, and isn't voting on any label.
         // Automatically CC them on this change so they receive replies.
-        Optional<PostReviewers.Addition> selfAddition =
+        PostReviewers.Addition selfAddition =
             postReviewers.ccCurrentUser(revision.getUser(), revision);
-        if (selfAddition.isPresent()) {
-          bu.addOp(revision.getChange().getId(), selfAddition.get().op);
-        }
+        bu.addOp(revision.getChange().getId(), selfAddition.op);
       }
 
       // Add WorkInProgressOp if requested.
diff --git a/java/com/google/gerrit/server/restapi/change/PostReviewers.java b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
index 102bf21978..4c85132531 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
@@ -80,7 +80,6 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.lib.Config;
@@ -209,18 +208,15 @@ public class PostReviewers
     return addByEmail(reviewer, rsrc, state, notify, accountsToNotify);
   }
 
-  Optional<Addition> ccCurrentUser(CurrentUser user, RevisionResource revision) {
-    return user.getUserName()
-        .map(
-            u ->
-                new Addition(
-                    u,
-                    revision.getChangeResource(),
-                    ImmutableSet.of(user.getAccountId()),
-                    null,
-                    CC,
-                    NotifyHandling.NONE,
-                    ImmutableListMultimap.of()));
+  Addition ccCurrentUser(CurrentUser user, RevisionResource revision) {
+    return new Addition(
+        user.getUserName().orElse(null),
+        revision.getChangeResource(),
+        ImmutableSet.of(user.getAccountId()),
+        null,
+        CC,
+        NotifyHandling.NONE,
+        ImmutableListMultimap.of());
   }
 
   @Nullable