diff --git a/admin/installer/cloudformation.py b/admin/installer/cloudformation.py
index 8e3aa6f774..6c12540f67 100644
--- a/admin/installer/cloudformation.py
+++ b/admin/installer/cloudformation.py
@@ -398,9 +398,4 @@ def _validate_cluster_size(size):
     Value="export DOCKER_TLS_VERIFY=1",
     Description="Client config: Enable TLS client for Swarm."
 ))
-template.add_output(Output(
-    "S3Bucket",
-    Value=Ref(s3bucket),
-    Description="Name of S3 bucket to hold cluster configuration files."
-))
 print(template.to_json())
diff --git a/admin/installer/setup_client.sh b/admin/installer/setup_client.sh
index 73fe3e605b..223b8eff2a 100644
--- a/admin/installer/setup_client.sh
+++ b/admin/installer/setup_client.sh
@@ -55,5 +55,12 @@ ${DOCKER_CERT_HOME}/createclient.exp
 # Copy Docker Certificates directory to Ubuntu's home directory.
 cp -r ${DOCKER_CERT_HOME} ${UBUNTU_HOME}
 
+# Clear out S3 bucket used by CloudFormation so that subsequent stack destroy attempt succeeds.
+s3cmd_wrapper del --recursive --config=/root/.s3cfg s3://${s3_bucket}
+
+# Delete S3 bucket with CloudFormation configuration.
+s3cmd_wrapper rb --config=/root/.s3cfg s3://${s3_bucket}
+
+
 # Signal successful stack creation.
 curl ${SUCCESS_SIGNAL_URL} || echo "Failed to report success to ClusterHQ"
diff --git a/admin/test/test_installer.py b/admin/test/test_installer.py
index 0ccb83b210..faa59dd4fe 100644
--- a/admin/test/test_installer.py
+++ b/admin/test/test_installer.py
@@ -208,14 +208,6 @@ def delete_cloudformation_stack(stack_id, aws_config):
         process environment before running the ``aws`` sub-command.
     :returns: A ``Deferred`` which fires when the stack has been deleted.
     """
-    result = get_stack_report(stack_id, aws_config)
-    outputs = result['Outputs']
-    s3_bucket_name = get_output(outputs, 'S3Bucket')
-    aws_output(
-        ['s3', 'rb', 's3://{}'.format(s3_bucket_name), '--force'],
-        aws_config,
-    )
-
     aws_output(
         ['cloudformation', 'delete-stack',
          '--stack-name', stack_id],