Rebase and merge #1138 from dalcde, closes #1138
Revert "Rebase and merge #1138 from dalcde, closes #1138"

This reverts commit 9356ed655813ee1c70772ec4aa7e37f1d2cb3ec6. The commit had the unfortunate side effect of deleting the last workspace in addition to the one to be deleted.