Revert "Trebuchet: Default workspace fixes"

This reverts commit eed8a5daca9ff0dbc0ad4237026640a46eec2b89.