Bugfixes:
Revert Auto Workbench behaviour change