diff --git a/build/build.xml b/build/build.xml
index 317ea10333..89ba0fde64 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -61,7 +61,7 @@
 
     <property name="version.major" value="3"/>
     <property name="version.minor" value="9"/>
-    <property name="version.revision" value="0"/>
+    <property name="version.revision" value=""/>
     <property name="version.extra" value=""/>    <!-- For 'beta' or 'alpha' -->
     <property name="dist.prefix" value="openfire"/>
 
diff --git a/src/java/org/jivesoftware/openfire/session/LocalClientSession.java b/src/java/org/jivesoftware/openfire/session/LocalClientSession.java
index e6dca90434..c36fb472e9 100644
--- a/src/java/org/jivesoftware/openfire/session/LocalClientSession.java
+++ b/src/java/org/jivesoftware/openfire/session/LocalClientSession.java
@@ -824,8 +824,6 @@ public int incrementConflictCount() {
      */
     @Override
 	public boolean canProcess(Packet packet) {
-        // All packets from our own service are implicitly not blocked
-        if (packet.getFrom().getDomain().equals(serverName)) return true;
 
         PrivacyList list = getActiveList();
         if (list != null) {
diff --git a/src/java/org/jivesoftware/openfire/session/LocalSession.java b/src/java/org/jivesoftware/openfire/session/LocalSession.java
index 5d560987c8..810c2a0379 100644
--- a/src/java/org/jivesoftware/openfire/session/LocalSession.java
+++ b/src/java/org/jivesoftware/openfire/session/LocalSession.java
@@ -74,7 +74,7 @@ public abstract class LocalSession implements Session {
 
     protected SessionManager sessionManager;
 
-    protected String serverName;
+    private String serverName;
 
     private long startDate = System.currentTimeMillis();