diff --git a/bin/teardown.sh b/bin/teardown.sh
index a51f6ce..d45ecae 100755
--- a/bin/teardown.sh
+++ b/bin/teardown.sh
@@ -2,9 +2,9 @@
 
 TOP="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/.."
 
-reboot=yes
+reboot=no
 case $1 in
-    --no-reboot) reboot=no; shift ;;
+    --reboot) reboot=yes; shift ;;
 esac
 
 if [ $# != 1 ]; then
@@ -13,17 +13,18 @@ if [ $# != 1 ]; then
 fi
 
 d=$1
-tmp=$TOP/clusters/$d/.$d.$$
+tmp=$TOP/clusters/.$d.$$
 
 teardown () {
-    sed '/k8s *= *{/,+1 s/enable *= *true/enable = false/' \
-        $TOP/clusters/$d/default.nix > $tmp
+    mkdir -p $tmp
+    cp -r $TOP/clusters/$d/* $tmp
+    sed -i '/k8s *= *{/,+1 s/enable *= *true/enable = false/' $tmp/cluster.nix
     nixops modify -d $d $tmp
     nixops deploy -d $d
     [ $reboot = yes ] && nixops reboot -d $d
     nixops ssh-for-each -d $d \
         "rm -rf /var/run/kubernetes /var/lib/kubernetes /var/lib/etcd /var/lib/kubelet /var/lib/cfssl"
-    rm $tmp
+    rm -rf $tmp
 }
 cat << EOF