diff --git a/weave b/weave
index 2ce18483..c86aa722 100755
--- a/weave
+++ b/weave
@@ -778,50 +778,7 @@ dns_args() {
     DNS_DOMAIN=${DNS_DOMAIN:-weave.local.}
     DNS_ADDRESS=${DNS_ADDRESS:-$(call_weave GET /dns-address 2>/dev/null)}
 
-    NAME_ARG=""
-    HOSTNAME_SPECIFIED=
-    DNS_SEARCH_SPECIFIED=
-    WITHOUT_DNS=
-    while [ $# -gt 0 ] ; do
-        case "$1" in
-            --without-dns)
-                WITHOUT_DNS=1
-                ;;
-            --name)
-                NAME_ARG="$2"
-                shift
-                ;;
-            --name=*)
-                NAME_ARG="${1#*=}"
-                ;;
-            -h|--hostname|--hostname=*)
-                HOSTNAME_SPECIFIED=1
-                ;;
-            --dns-search|--dns-search=*)
-                DNS_SEARCH_SPECIFIED=1
-                ;;
-        esac
-        shift
-    done
-    [ -n "$WITHOUT_DNS" ] && return 0
-
-    DNS_ARGS="--dns=$DNS_ADDRESS"
-    if [ -n "$NAME_ARG" -a -z "$HOSTNAME_SPECIFIED" ] ; then
-        HOSTNAME="$NAME_ARG.${DNS_DOMAIN%.}"
-        if [ ${#HOSTNAME} -gt 64 ] ; then
-            echo "Container name too long to be used as hostname" >&2
-        else
-            DNS_ARGS="$DNS_ARGS --hostname=$HOSTNAME"
-            HOSTNAME_SPECIFIED=1
-        fi
-    fi
-    if [ -z "$DNS_SEARCH_SPECIFIED" ] ; then
-      if [ -z "$HOSTNAME_SPECIFIED" ] ; then
-        DNS_ARGS="$DNS_ARGS --dns-search=$DNS_DOMAIN"
-      else
-        DNS_ARGS="$DNS_ARGS --dns-search=."
-      fi
-    fi
+    DNS_ARGS="--dns=$DNS_ADDRESS --dns-search=$DNS_DOMAIN"
 }
 
 # Iff the container in $1 has an FQDN, invoke $2 as a command passing