Revert "Fix workspace setup"

This reverts commit 4d2f0e7c8572c9587e51ebfbd940c95c10e754a5