diff --git a/AUTHORS b/AUTHORS
index c85f0bd6c1..f9aa9eabe5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ James E. Blair <james.blair@rackspace.com>
 Jason Cannavale <jason.cannavale@rackspace.com>
 Jay Pipes <jaypipes@gmail.com>
 Jesse Andrews <anotherjesse@gmail.com>
+Joe Gordon <jogo@cloudscaling.com>
 Johannes Erdfelt <johannes.erdfelt@rackspace.com>
 John Postlethwait <john.postlethwait@nebula.com>
 Josh Kearney <josh@jk0.org>
diff --git a/files/swift/proxy-server.conf b/files/swift/proxy-server.conf
index ce5473b2ac..2fe20f57f0 100644
--- a/files/swift/proxy-server.conf
+++ b/files/swift/proxy-server.conf
@@ -23,8 +23,6 @@ operator_roles = Member,admin
 # username and password.
 [filter:s3token]
 paste.filter_factory = keystone.middleware.s3_token:filter_factory
-service_port = %KEYSTONE_SERVICE_PORT%
-service_host = %KEYSTONE_SERVICE_HOST%
 auth_port = %KEYSTONE_AUTH_PORT%
 auth_host = %KEYSTONE_AUTH_HOST%
 auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
diff --git a/stack.sh b/stack.sh
index 45e285c90a..19679c8f22 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1445,8 +1445,6 @@ if is_service_enabled swift; then
        s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g;
        s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g;
        s,%SERVICE_TOKEN%,${SERVICE_TOKEN},g;
-       s,%KEYSTONE_SERVICE_PORT%,${KEYSTONE_SERVICE_PORT},g;
-       s,%KEYSTONE_SERVICE_HOST%,${KEYSTONE_SERVICE_HOST},g;
        s,%KEYSTONE_API_PORT%,${KEYSTONE_API_PORT},g;
        s,%KEYSTONE_AUTH_HOST%,${KEYSTONE_AUTH_HOST},g;
        s,%KEYSTONE_AUTH_PORT%,${KEYSTONE_AUTH_PORT},g;