diff --git a/run.sh b/run.sh
index da81974..1d1ef28 100755
--- a/run.sh
+++ b/run.sh
@@ -10,8 +10,6 @@ REPOSITORY=stucki/cyanogenmod
 test -d $SOURCE || mkdir $SOURCE
 
 # Try to start an existing/stopped container with the given name $CONTAINER. Otherwise, run a new one.
-# The exec stuff at the end is a workaround which is currently needed (docker 0.8.0) to run screen within docker...
-# see https://github.com/dotcloud/docker/issues/728
-docker start -i $CONTAINER 2>/dev/null || docker run -v $SOURCE:/home/cmbuild/android -i -t -name $CONTAINER $REPOSITORY sh -c "exec >/dev/tty 2>/dev/tty </dev/tty && screen -s /bin/bash"
+docker start -i $CONTAINER 2>/dev/null || docker run -v $SOURCE:/home/cmbuild/android -i -t -name $CONTAINER $REPOSITORY "screen -s /bin/bash"
 
 exit $?