Revert "Express shell"

This reverts commit 93b271c20b2c1c0ef7b0b07d3f53db57fe407280.
Revert "Revert "Express shell""

This reverts commit 7772df397578335311ff2bfe5b44fb8e915118ff.