Merge pull request #258 from colincross/console

Revert "Put the primary builder into the console pool"