Remove dependency on Workspace API.