reverted refactor in workspace