Revert "Workspace: Small cleanup"

This reverts commit c250ddd90a45caf7c5a19738dd7aaa27bb5703d1.