Revert "workspace container"

This reverts commit 17f3b378c8a73b8d9bffa2cbfcee057d305f84b3.