Ugh. Fixing the bootstrap thread issue.