diff --git a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java
index a124de9cc..882b26e9b 100644
--- a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java
+++ b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java
@@ -48,7 +48,9 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
+import com.google.common.flogger.FluentLogger;
 import com.google.common.net.InternetDomainName;
+import google.registry.config.RegistryEnvironment;
 import google.registry.dns.DnsQueue;
 import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
@@ -146,6 +148,9 @@ public final class DomainUpdateFlow implements TransactionalFlow {
   private static final ImmutableSet<StatusValue> UPDATE_DISALLOWED_STATUSES =
       ImmutableSet.of(StatusValue.PENDING_DELETE, StatusValue.SERVER_UPDATE_PROHIBITED);
 
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  private boolean isNsDelete;
   @Inject ResourceCommand resourceCommand;
   @Inject ExtensionManager extensionManager;
   @Inject EppInput eppInput;
@@ -200,6 +205,16 @@ public final class DomainUpdateFlow implements TransactionalFlow {
                     EntityChanges.newBuilder().setSaves(entitiesToSave.build()).build())
                 .build());
     persistEntityChanges(entityChanges);
+    // Ideally we would like to reload the persisted entity and show what is actually persisted, but
+    // reloading in the current session will only give back the cached version in Hibernate. It is
+    // impossible to see what is actually persisted in the DB because PSQL doesn't support
+    // READ_UNCOMMITTED. So even if we call flush here and query with another entitymanager at
+    // READ_UNCOMMITTED isolation level, PSQL won't show us the new data. Therefore, we have to make
+    // do with trusting that the to-be-persisted entity is persisted as-is by the transaction
+    // manager.
+    if (isNsDelete) {
+      logger.atInfo().log("Nameservers to persist:\n%s", newDomain.getNameservers());
+    }
     return responseBuilder.build();
   }
 
@@ -237,6 +252,12 @@ public final class DomainUpdateFlow implements TransactionalFlow {
       throws EppException {
     AddRemove add = command.getInnerAdd();
     AddRemove remove = command.getInnerRemove();
+    if (RegistryEnvironment.get() != RegistryEnvironment.PRODUCTION
+        && !remove.getNameservers().isEmpty()) {
+      isNsDelete = true;
+      logger.atInfo().log("Current nameservers:\n%s", tm().loadByEntity(domain).getNsHosts());
+      logger.atInfo().log("Nameservers to remove:\n%s", remove.getNameservers());
+    }
     checkSameValuesNotAddedAndRemoved(add.getNameservers(), remove.getNameservers());
     checkSameValuesNotAddedAndRemoved(add.getContacts(), remove.getContacts());
     checkSameValuesNotAddedAndRemoved(add.getStatusValues(), remove.getStatusValues());
diff --git a/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java b/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java
index f6158f986..75a115292 100644
--- a/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java
+++ b/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java
@@ -24,6 +24,7 @@ import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppcommon.AuthInfo;
 import google.registry.model.eppcommon.StatusValue;
+import google.registry.model.eppinput.ResourceCommand.ResourceUpdate.AddRemove;
 import google.registry.util.TypeUtils.TypeInstantiator;
 import java.util.List;
 import java.util.Set;
@@ -91,10 +92,11 @@ public interface ResourceCommand {
    * @param <C> the change type
    */
   @XmlTransient
-  abstract class ResourceUpdate
-      <A extends ResourceUpdate.AddRemove,
-       B extends EppResource.Builder<?, ?>,
-       C extends ResourceCreateOrChange<B>> extends AbstractSingleResourceCommand  {
+  abstract class ResourceUpdate<
+          A extends AddRemove,
+          B extends EppResource.Builder<?, ?>,
+          C extends ResourceCreateOrChange<B>>
+      extends AbstractSingleResourceCommand {
 
     /** Part of an update command that specifies set values to add or remove. */
     @XmlTransient
@@ -113,7 +115,7 @@ public interface ResourceCommand {
 
     protected abstract A getNullableInnerRemove();
 
-    // Don't use MoreObjects.firstNonNull in these method because it will result in an unneeded
+    // Don't use MoreObjects.firstNonNull in these methods because it will result in an unneeded
     // reflective instantiation when the object isn't null.
 
     public C getInnerChange() {
diff --git a/docs/build.gradle b/docs/build.gradle
index 7e34a7d57..868d75996 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -16,6 +16,7 @@ dependencies {
   def deps = rootProject.dependencyMap
 
   compile deps['com.beust:jcommander']
+  compile deps['com.google.appengine:appengine-api-1.0-sdk']
   compile deps['com.google.code.findbugs:jsr305']
   compile deps['com.google.flogger:flogger']
   compile deps['com.google.guava:guava']