This reverts commit 759d031a5f. This was originally to solve some issues with builds during the workspace refactor in #86 but this didn't end up being the root cause, so it may actually be better to split these tasks again.
759d031a5f