diff --git a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java
index c45eaf386..6977c10b0 100644
--- a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java
+++ b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java
@@ -358,7 +358,6 @@ public final class DomainApplicationCreateFlow implements TransactionalFlow {
       extraFlowLogic.get().performAdditionalApplicationCreateLogic(
           newApplication,
           clientId,
-          newApplication.getCreationTime(),
           years,
           eppInput,
           historyEntry);
diff --git a/java/google/registry/flows/domain/RegistryExtraFlowLogic.java b/java/google/registry/flows/domain/RegistryExtraFlowLogic.java
index 5a63ea072..632d55da6 100644
--- a/java/google/registry/flows/domain/RegistryExtraFlowLogic.java
+++ b/java/google/registry/flows/domain/RegistryExtraFlowLogic.java
@@ -41,7 +41,6 @@ public interface RegistryExtraFlowLogic {
   public void performAdditionalApplicationCreateLogic(
       DomainApplication application,
       String clientId,
-      DateTime asOfDate,
       int years,
       EppInput eppInput,
       HistoryEntry historyEntry) throws EppException;
diff --git a/javatests/google/registry/flows/dotapp/testdata/application_create_no_flags.xml b/javatests/google/registry/flows/dotapp/testdata/application_create_no_flags.xml
new file mode 100644
index 000000000..6e444dcb5
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/application_create_no_flags.xml
@@ -0,0 +1,27 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <create>
+      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+        <domain:period unit="y">1</domain:period>
+        <domain:ns>
+          <domain:hostObj>ns1.example.net</domain:hostObj>
+          <domain:hostObj>ns2.example.net</domain:hostObj>
+        </domain:ns>
+        <domain:registrant>jd1234</domain:registrant>
+        <domain:contact type="admin">sh8013</domain:contact>
+        <domain:contact type="tech">sh8013</domain:contact>
+        <domain:authInfo>
+          <domain:pw>2fooBAR</domain:pw>
+        </domain:authInfo>
+      </domain:create>
+    </create>
+    <extension>
+      <launch:create
+       xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
+        <launch:phase name="landrush">sunrise</launch:phase>
+     </launch:create>
+    </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/application_create_one_flag.xml b/javatests/google/registry/flows/dotapp/testdata/application_create_one_flag.xml
new file mode 100644
index 000000000..721e5cfe6
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/application_create_one_flag.xml
@@ -0,0 +1,30 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <create>
+      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+        <domain:period unit="y">1</domain:period>
+        <domain:ns>
+          <domain:hostObj>ns1.example.net</domain:hostObj>
+          <domain:hostObj>ns2.example.net</domain:hostObj>
+        </domain:ns>
+        <domain:registrant>jd1234</domain:registrant>
+        <domain:contact type="admin">sh8013</domain:contact>
+        <domain:contact type="tech">sh8013</domain:contact>
+        <domain:authInfo>
+          <domain:pw>2fooBAR</domain:pw>
+        </domain:authInfo>
+      </domain:create>
+    </create>
+    <extension>
+      <flags:create xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:flag>%FLAG%</flags:flag>
+      </flags:create>
+      <launch:create
+       xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
+        <launch:phase name="landrush">sunrise</launch:phase>
+      </launch:create>
+    </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/application_create_two_flags.xml b/javatests/google/registry/flows/dotapp/testdata/application_create_two_flags.xml
new file mode 100644
index 000000000..15f36388e
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/application_create_two_flags.xml
@@ -0,0 +1,31 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <create>
+      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+        <domain:period unit="y">1</domain:period>
+        <domain:ns>
+          <domain:hostObj>ns1.example.net</domain:hostObj>
+          <domain:hostObj>ns2.example.net</domain:hostObj>
+        </domain:ns>
+        <domain:registrant>jd1234</domain:registrant>
+        <domain:contact type="admin">sh8013</domain:contact>
+        <domain:contact type="tech">sh8013</domain:contact>
+        <domain:authInfo>
+          <domain:pw>2fooBAR</domain:pw>
+        </domain:authInfo>
+      </domain:create>
+    </create>
+    <extension>
+      <flags:create xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:flag>%FLAG1%</flags:flag>
+        <flags:flag>%FLAG2%</flags:flag>
+      </flags:create>
+      <launch:create
+       xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
+        <launch:phase name="landrush">sunrise</launch:phase>
+      </launch:create>
+    </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/model/domain/TestExtraLogicManager.java b/javatests/google/registry/model/domain/TestExtraLogicManager.java
index 73573aa5b..6adab8e2d 100644
--- a/javatests/google/registry/model/domain/TestExtraLogicManager.java
+++ b/javatests/google/registry/model/domain/TestExtraLogicManager.java
@@ -118,7 +118,6 @@ public class TestExtraLogicManager implements RegistryExtraFlowLogic {
   public void performAdditionalApplicationCreateLogic(
       DomainApplication application,
       String clientId,
-      DateTime asOfDate,
       int years,
       EppInput eppInput,
       HistoryEntry historyEntry) throws EppException {