Should we move this to the build thread?