Revert "Always start shell in screen"

This reverts commit be6916a4d5aaf7012aaa630caf2370b9cd719697.