Revert "remove workspace approach, it's not used"

This reverts commit 97d6de921faf7c42d7a46b9f783e01081ba92fb6.