diff --git a/config/types.go b/config/types.go
index 7fde37ee..e1fa12a5 100644
--- a/config/types.go
+++ b/config/types.go
@@ -94,7 +94,6 @@ type RancherConfig struct {
 	CloudInit           CloudInit                                 `yaml:"cloud_init,omitempty"`
 	Debug               bool                                      `yaml:"debug,omitempty"`
 	RmUsr               bool                                      `yaml:"rm_usr,omitempty"`
-	NoSharedRoot        bool                                      `yaml:"no_sharedroot,omitempty"`
 	Log                 bool                                      `yaml:"log,omitempty"`
 	ForceConsoleRebuild bool                                      `yaml:"force_console_rebuild,omitempty"`
 	Disable             []string                                  `yaml:"disable,omitempty"`
diff --git a/images/02-console/docker-init b/images/02-console/docker-init
index 974dfb71..d02bc809 100755
--- a/images/02-console/docker-init
+++ b/images/02-console/docker-init
@@ -19,10 +19,4 @@ for i in /opt/bin /usr/local/bin; do
     fi
 done
 
-mount --make-shared /
-
-if [ "$(grep '/var/lib/docker /var/lib/docker ' /proc/self/mountinfo | awk '{print $9}')" = "rootfs" ]; then
-    export DOCKER_RAMDISK=1
-fi
-
 exec /usr/bin/dockerlaunch $DOCKER_BIN "$@" $DOCKER_OPTS >>/var/log/docker.log 2>&1
diff --git a/init/init.go b/init/init.go
index 722aa24d..98293023 100644
--- a/init/init.go
+++ b/init/init.go
@@ -11,7 +11,6 @@ import (
 	"syscall"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/mount"
 	"github.com/rancher/docker-from-scratch"
 	"github.com/rancher/os/config"
 	"github.com/rancher/os/util"
@@ -180,28 +179,6 @@ func isInitrd() bool {
 	return int64(stat.Type) == TMPFS_MAGIC || int64(stat.Type) == RAMFS_MAGIC
 }
 
-func setupSharedRoot(c *config.CloudConfig) (*config.CloudConfig, error) {
-	if !c.NoSharedRoot {
-		return c, nil
-	}
-
-	if isInitrd() {
-		for _, i := range []string{"/mnt", "/media"} {
-			if err := os.Mkdir(i, 0755); err != nil {
-				return c, err
-			}
-			if err := mount.Mount("tmpfs", i, "tmpfs", "rw"); err != nil {
-				return c, err
-			}
-			if err := mount.MakeRShared(i); err != nil {
-				return c, err
-			}
-		}
-		return c, nil
-	}
-	return c, mount.MakeShared("/")
-}
-
 func RunInit() error {
 	os.Setenv("PATH", "/sbin:/usr/sbin:/usr/bin")
 	if isInitrd() {
@@ -241,7 +218,6 @@ func RunInit() error {
 			return c, dockerlaunch.PrepareFs(&mountConfig)
 		},
 		initializeSelinux,
-		setupSharedRoot,
 		sysInit,
 	}
 
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 3b7e82dc..ccd6b4f7 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -171,8 +171,6 @@ rancher:
       - all-volumes
       volumes:
       - /usr/bin/iptables:/sbin/iptables:ro
-      - /media:/media:shared
-      - /mnt:/mnt:shared
     container-data-volumes:
       image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}}
       labels:
diff --git a/scripts/build-host b/scripts/build-host
index 7230616a..03d60765 100755
--- a/scripts/build-host
+++ b/scripts/build-host
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 cd $(dirname $0)/..
 
diff --git a/scripts/clean b/scripts/clean
index 8c6b0034..654c724e 100755
--- a/scripts/clean
+++ b/scripts/clean
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 cd $(dirname $0)/..
 rm -rf build dist bin images/*/build
diff --git a/scripts/default b/scripts/default
index f41e23da..d17e8165 100755
--- a/scripts/default
+++ b/scripts/default
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 cd $(dirname $0)
 
diff --git a/scripts/dev b/scripts/dev
index 237ff112..740284b5 100755
--- a/scripts/dev
+++ b/scripts/dev
@@ -1,6 +1,5 @@
 #!/bin/bash
 # help: For development, creates iso, kernel, initrd gzip compressed
-set -e
 
 cd $(dirname $0)
 
diff --git a/scripts/entry b/scripts/entry
index e093ec10..4e8a0f25 100755
--- a/scripts/entry
+++ b/scripts/entry
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 mkdir -p bin dist build/initrd
 if [ -e ./scripts/$1 ]; then
diff --git a/scripts/hash-initrd b/scripts/hash-initrd
index 88b06ec3..15576562 100755
--- a/scripts/hash-initrd
+++ b/scripts/hash-initrd
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 cd $(dirname $0)/../build/initrd
 
diff --git a/scripts/help b/scripts/help
index b4d558d8..7f1f112e 100755
--- a/scripts/help
+++ b/scripts/help
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 cd $(dirname $0)
 
diff --git a/scripts/release b/scripts/release
index 8a3676fc..80a80a63 100755
--- a/scripts/release
+++ b/scripts/release
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 source $(dirname $0)/version
 export REPO_VERSION=$VERSION
diff --git a/scripts/version b/scripts/version
index d463f3d0..f99dbde8 100755
--- a/scripts/version
+++ b/scripts/version
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
     DIRTY="-dirty"
 fi
diff --git a/tests/integration/rostest/test_15_shared_mount.py b/tests/integration/rostest/test_15_shared_mount.py
deleted file mode 100644
index 9c0154f6..00000000
--- a/tests/integration/rostest/test_15_shared_mount.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import pytest
-import rostest.util as u
-from rostest.util import SSH
-
-
-@pytest.fixture(scope="module")
-def qemu(request):
-    q = u.run_qemu(request)
-    u.flush_out(q.stdout)
-    return q
-
-
-def test_shared_mount(qemu):
-    SSH(qemu).check_call('''
-set -x -e
-
-sudo mkdir /mnt/shared
-sudo touch /test
-sudo system-docker run --privileged -v /mnt:/mnt:shared -v /test:/test {busybox_image} mount --bind / /mnt/shared
-ls /mnt/shared | grep test
-    '''.format(busybox_image=u.busybox_image))
diff --git a/tests/integration/rostest/util.py b/tests/integration/rostest/util.py
index 3f8559cf..3d73ed56 100644
--- a/tests/integration/rostest/util.py
+++ b/tests/integration/rostest/util.py
@@ -15,11 +15,6 @@ if arch != 'amd64':
     suffix = '_' + arch
 
 
-busybox_image = {'amd64': 'busybox',
-                 'arm': 'armhf/busybox',
-                 'arm64': 'aarch64/busybox'}[arch]
-
-
 def iter_lines(s):
     return it.imap(str.rstrip, iter(s.readline, ''))