diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
index 012b21a..ffa8a8b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
@@ -31,7 +31,6 @@
 import com.google.gerrit.server.config.CanonicalWebUrl;
 import com.google.gerrit.server.git.LabelNormalizer;
 import com.google.gerrit.server.git.NotesBranchUtil;
-
 import com.google.gerrit.server.notedb.ChangeNotes;
 import com.google.gerrit.server.project.NoSuchChangeException;
 import com.google.gerrit.server.project.ProjectCache;
@@ -275,10 +274,11 @@
     // TODO(dborowitz): These will eventually be stamped in the ChangeNotes at
     // commit time so we will be able to skip this normalization step.
     ChangeNotes changeNotes = changeNotesFactory.create(change);
-    List<PatchSetApproval> approvals = labelNormalizer.normalize(change,
-        approvalsUtil.byPatchSet(reviewDb, changeNotes, ps.getId()));
+    List<PatchSetApproval> curr =
+        approvalsUtil.byPatchSet(reviewDb, changeNotes, ps.getId());
     PatchSetApproval submit = null;
-    for (PatchSetApproval a : approvals) {
+    for (PatchSetApproval a :
+        labelNormalizer.normalize(change, curr).getNormalized()) {
       if (a.getValue() == 0) {
         // Ignore 0 values.
       } else if (a.isSubmit()) {