diff --git a/src/etc/rc.d/unbound b/src/etc/rc.d/unbound
index c591b0b1..378031b9 100644
--- a/src/etc/rc.d/unbound
+++ b/src/etc/rc.d/unbound
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: unbound,v 1.2 2014/12/29 11:17:43 ajacoutot Exp $
+# $OpenBSD: unbound,v 1.3 2015/07/19 17:31:21 sthen Exp $
 
 daemon="/usr/sbin/unbound"
 daemon_flags="-c /var/unbound/etc/unbound.conf"
@@ -10,14 +10,6 @@ daemon_flags="-c /var/unbound/etc/unbound.conf"
 pexp="unbound${daemon_flags:+ ${daemon_flags}}"
 
 rc_pre() {
-	if grep '^[[:space:]]*control-enable:[[:space:]]*yes' \
-	    /var/unbound/etc/unbound.conf > /dev/null 2>&1 && \
-	    ! [[ -f /var/unbound/etc/unbound_server.key ||
-	    -f /var/unbound/etc/unbound_server.pem ||
-	    -f /var/unbound/etc/unbound_control.key ||
-	    -f /var/unbound/etc/unbound_control.pem ]]; then
-		/usr/sbin/unbound-control-setup 2> /dev/null
-	fi
 	if grep '^[[:space:]]*auto-trust-anchor-file:' \
             /var/unbound/etc/unbound.conf > /dev/null 2>&1; then
 		/usr/sbin/unbound-anchor -v || true